diff --git a/pom.xml b/pom.xml
index 387af7d..556fd93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<webappDirectory>${project.basedir}/src/main/webapp/WEB-INF</webappDirectory>
 		<distroDirectory>${project.basedir}/distro</distroDirectory>
-		<serviceClass>DataPublishing</serviceClass>
+		<serviceClass>Accounting</serviceClass>
 	</properties>
 
 	<scm>
diff --git a/src/main/java/org/gcube/accounting/service/resources/ResourceInsert.java b/src/main/java/org/gcube/accounting/service/resources/ResourceInsert.java
index 3473a2b..37f8124 100644
--- a/src/main/java/org/gcube/accounting/service/resources/ResourceInsert.java
+++ b/src/main/java/org/gcube/accounting/service/resources/ResourceInsert.java
@@ -30,10 +30,8 @@ public class ResourceInsert {
 	private static final Logger log = LoggerFactory.getLogger(ResourceInsert.class);
 	
 	public static final String INSERT_PATH_PART = "insert";
-	public static final String RECORD_PATH_PART = "record";
 	
 	@POST
-	@Path(RECORD_PATH_PART)
 	@Consumes({MediaType.TEXT_PLAIN, AccountingResource.APPLICATION_JSON_CHARSET_UTF_8})
 	public Response add(String json) throws Exception {
 		
diff --git a/src/main/java/org/gcube/accounting/service/resources/ResourceQuery.java b/src/main/java/org/gcube/accounting/service/resources/ResourceQuery.java
index 7e36256..82881c1 100644
--- a/src/main/java/org/gcube/accounting/service/resources/ResourceQuery.java
+++ b/src/main/java/org/gcube/accounting/service/resources/ResourceQuery.java
@@ -26,13 +26,12 @@ public class ResourceQuery {
 	private static final Logger log = LoggerFactory.getLogger(ResourceQuery.class);
 
 	public static final String QUERY_PATH_PART = "query";
-	public static final String RECORD_PATH_PART = "record";
-
+	
 	public static final String TYPE_PATH_PART = "type";
 	public static final String RECORD_ID_PATH_PART = "recordID";
 
 	@GET
-	@Path(RECORD_PATH_PART + "/{" + TYPE_PATH_PART + "}/{" + RECORD_ID_PATH_PART + "}/")
+	@Path("/{" + TYPE_PATH_PART + "}/{" + RECORD_ID_PATH_PART + "}/")
 	@Produces(AccountingResource.APPLICATION_JSON_CHARSET_UTF_8)
 	public Response get(@NotNull @PathParam(TYPE_PATH_PART) String type,
 			@NotNull @PathParam(RECORD_ID_PATH_PART) String recordId) throws Exception {
diff --git a/src/main/java/org/gcube/accounting/service/resources/ServiceState.java b/src/main/java/org/gcube/accounting/service/resources/ServiceState.java
index 2252eb2..08470df 100644
--- a/src/main/java/org/gcube/accounting/service/resources/ServiceState.java
+++ b/src/main/java/org/gcube/accounting/service/resources/ServiceState.java
@@ -37,11 +37,10 @@ public class ServiceState {
 	public static final String INSERT_CONNECTION_UP = "insertConnection";
 	
 	@GET
-	@Path("/")
 	@Produces(AccountingResource.APPLICATION_JSON_CHARSET_UTF_8)
 	public Response getState() throws JSONException {
 		String context = AccountingServiceInitializer.getCurrentContext();
-		logger.debug("Getting Service Status fro context {}", context);
+		logger.debug("Getting Service Status for context {}", context);
 		
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.append(SERVICE, RUNNING);