Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryService.java	(revision 61380)
@@ -35,9 +35,9 @@
                                            String page,
                                            String size) throws JSONException, IOException;
 
-    List<RepositorySnippet> getRepositoriesSnippetOfUser(String page, String size) throws Exception;
+    List<RepositorySnippet> getRepositoriesSnippetsOfUser(String page, String size) throws Exception;
 
-    List<RepositorySnippet> getRepositoriesSnippetOfUser(String userEmail, String page, String size) throws Exception;
+    List<RepositorySnippet> getRepositoriesSnippetsOfUser(String userEmail, String page, String size) throws Exception;
 
     RepositorySnippet getRepositorySnippetById(String id) throws JSONException, ResourceNotFoundException;
 
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/RepositoryServiceImpl.java	(revision 61380)
@@ -351,13 +351,13 @@
     }
 
     @Override
-    public List<RepositorySnippet> getRepositoriesSnippetOfUser(String page, String size) throws Exception {
+    public List<RepositorySnippet> getRepositoriesSnippetsOfUser(String page, String size) throws Exception {
         Collection<String> repoIds = roleMappingService.getRepoIdsByRoleIds(authorizationService.getUserRoles());
         return getRepositoriesSnippets(new ArrayList<>(repoIds));
     }
 
     @Override
-    public List<RepositorySnippet> getRepositoriesSnippetOfUser(String userEmail, String page, String size) throws Exception {
+    public List<RepositorySnippet> getRepositoriesSnippetsOfUser(String userEmail, String page, String size) throws Exception {
         Collection<String> repoIds = roleMappingService.getRepoIdsByRoleIds(authorizationService.getUserRoles(userEmail));
         return getRepositoriesSnippets(new ArrayList<>(repoIds));
     }
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/BrokerServiceImpl.java	(revision 61380)
@@ -7,6 +7,7 @@
 import eu.dnetlib.repo.manager.domain.Term;
 import eu.dnetlib.repo.manager.domain.Tuple;
 import eu.dnetlib.repo.manager.domain.broker.*;
+import org.apache.commons.lang.NotImplementedException;
 import org.json.JSONException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -81,7 +82,7 @@
         long start = System.currentTimeMillis();
         DatasourcesBroker ret = new DatasourcesBroker();
         try {
-            ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetOfUser(user, "0", "100")));
+            ret.setDatasourcesOfUser(getDatasourcesOfUserType(repoAPI.getRepositoriesSnippetsOfUser(user, "0", "100")));
             //TODO fix bug when values are true
 //            if (Boolean.parseBoolean(includeShared)) {
 //                List<String> sharedDatasourceIds = new ArrayList<String>();
@@ -165,9 +166,9 @@
         List<Tuple<BrowseEntry, String>> entries = new ArrayList<>();
         for (RepositorySnippet repo : repositories) {
             BrowseEntry temp = new BrowseEntry();
-            temp.setValue(repo.getOfficialName());
+            temp.setValue(repo.getOfficialname());
             temp.setSize(new Long(0));
-            for (BrowseEntry e : getTopicsForDatasource(repo.getOfficialName())) {
+            for (BrowseEntry e : getTopicsForDatasource(repo.getOfficialname())) {
                 temp.setSize(temp.getSize() + e.getSize());
             }
             Tuple<BrowseEntry, String> tup = new Tuple<>(temp, repo.getLogoUrl());
@@ -245,8 +246,8 @@
     @Override
     public Map<String, List<SimpleSubscriptionDesc>> getSimpleSubscriptionsOfUserByRepoId(String userEmail, String repoId) throws BrokerException {
         Map<String, List<SimpleSubscriptionDesc>> subscriptionsOfUser = getSimpleSubscriptionsOfUser(userEmail);
-
-        return null;
+        throw new NotImplementedException();
+//        return null;
     }
 
     @Override
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/service/DashboardServiceImpl.java	(revision 61380)
@@ -32,11 +32,11 @@
 
         try {
 
-            List<RepositorySnippet> repositoriesOfUser = repositoryService.getRepositoriesSnippetOfUser(userEmail, page, size);
+            List<RepositorySnippet> repositoriesOfUser = repositoryService.getRepositoriesSnippetsOfUser(userEmail, page, size);
             for (RepositorySnippet repository : repositoriesOfUser) {
                 RepositorySummaryInfo repositorySummaryInfo = new RepositorySummaryInfo();
                 repositorySummaryInfo.setId(repository.getId());
-                repositorySummaryInfo.setRepositoryName(repository.getOfficialName());
+                repositorySummaryInfo.setRepositoryName(repository.getOfficialname());
                 repositorySummaryInfo.setLogoURL(repository.getLogoUrl());
 
                 //TODO getRepositoryAggregations returns only the 20 more recent items. Is it positive that we will find an indexed version there?
@@ -65,7 +65,7 @@
 
                 try {
 
-                    List<BrowseEntry> events = brokerService.getTopicsForDatasource(repository.getOfficialName());
+                    List<BrowseEntry> events = brokerService.getTopicsForDatasource(repository.getOfficialname());
                     Long totalEvents = 0L;
                     for (BrowseEntry browseEntry : events)
                         totalEvents += browseEntry.getSize();
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/utils/Converter.java	(revision 61380)
@@ -156,19 +156,19 @@
 
 
         repositorySnippet.setId(repositorySnippetObject.get("id").toString());
-        repositorySnippet.setOfficialName(repositorySnippetObject.get("officialname").toString());
+        repositorySnippet.setOfficialname(repositorySnippetObject.get("officialname").toString());
 
-        repositorySnippet.setEnglishName(repositorySnippetObject.get("englishname").toString());
-        if (repositorySnippet.getEnglishName().equals("null"))
-            repositorySnippet.setEnglishName("");
+        repositorySnippet.setEnglishname(repositorySnippetObject.get("englishname").toString());
+        if (repositorySnippet.getEnglishname().equals("null"))
+            repositorySnippet.setEnglishname("");
 
-        repositorySnippet.setWebsiteUrl(repositorySnippetObject.get("websiteurl").toString());
-        if (repositorySnippet.getWebsiteUrl().equals("null"))
-            repositorySnippet.setWebsiteUrl("");
+        repositorySnippet.setWebsiteurl(repositorySnippetObject.get("websiteurl").toString());
+        if (repositorySnippet.getWebsiteurl().equals("null"))
+            repositorySnippet.setWebsiteurl("");
 
-        repositorySnippet.setRegisteredBy(repositorySnippetObject.get("registeredby").toString());
-        if (repositorySnippet.getRegisteredBy().equals("null"))
-            repositorySnippet.setRegisteredBy("");
+        repositorySnippet.setRegisteredby(repositorySnippetObject.get("registeredby").toString());
+        if (repositorySnippet.getRegisteredby().equals("null"))
+            repositorySnippet.setRegisteredby("");
         return repositorySnippet;
 
     }
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/controllers/RepositoryController.java	(revision 61380)
@@ -65,7 +65,7 @@
     @ResponseBody
     @PreAuthorize("hasAuthority('REGISTERED_USER')")
     public List<RepositorySnippet> getRepositoriesSnippetsOfUser() throws Exception {
-        return repositoryService.getRepositoriesSnippetOfUser("0", "100");
+        return repositoryService.getRepositoriesSnippetsOfUser("0", "100");
     }
 
     @RequestMapping(value = "/searchRegisteredRepositories/{page}/{size}", method = RequestMethod.GET,
Index: modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java
===================================================================
--- modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java	(revision 61379)
+++ modules/uoa-repository-manager-service/branches/aai_roles_new/src/main/java/eu/dnetlib/repo/manager/domain/RepositorySnippet.java	(revision 61380)
@@ -7,14 +7,15 @@
 
 public class RepositorySnippet {
 
+    // Do not refactor names to keep compatibility with external api.
     private String id;
-    private String officialName;
-    private String englishName;
-    private String websiteUrl;
+    private String officialname;
+    private String englishname;
+    private String websiteurl;
     private String typology;
-    private String registeredBy;
+    private String registeredby;
     private Organization[] organizations;
-    private String registrationDate;
+    private String registrationdate;
     private String logoUrl;
     private String description;
     private String fullTextDownload;
@@ -35,36 +36,36 @@
         this.id = id;
     }
 
-    public String getOfficialName() {
-        return officialName;
+    public String getOfficialname() {
+        return officialname;
     }
 
-    public void setOfficialName(String officialName) {
-        this.officialName = officialName;
+    public void setOfficialname(String officialname) {
+        this.officialname = officialname;
     }
 
-    public String getEnglishName() {
-        return englishName;
+    public String getEnglishname() {
+        return englishname;
     }
 
-    public void setEnglishName(String englishName) {
-        this.englishName = englishName;
+    public void setEnglishname(String englishname) {
+        this.englishname = englishname;
     }
 
-    public String getWebsiteUrl() {
-        return websiteUrl;
+    public String getWebsiteurl() {
+        return websiteurl;
     }
 
-    public void setWebsiteUrl(String websiteUrl) {
-        this.websiteUrl = websiteUrl;
+    public void setWebsiteurl(String websiteurl) {
+        this.websiteurl = websiteurl;
     }
 
-    public String getRegisteredBy() {
-        return registeredBy;
+    public String getRegisteredby() {
+        return registeredby;
     }
 
-    public void setRegisteredBy(String registeredBy) {
-        this.registeredBy = registeredBy;
+    public void setRegisteredby(String registeredby) {
+        this.registeredby = registeredby;
     }
 
     public String getTypology() {
@@ -83,12 +84,12 @@
         this.organizations = organizations;
     }
 
-    public String getRegistrationDate() {
-        return registrationDate;
+    public String getRegistrationdate() {
+        return registrationdate;
     }
 
-    public void setRegistrationDate(String registrationDate) {
-        this.registrationDate = registrationDate;
+    public void setRegistrationdate(String registrationdate) {
+        this.registrationdate = registrationdate;
     }
 
     public PiwikInfo getPiwikInfo() {
