diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java
index cbc565ac1106ba0fd61cbfb1a1c181522116a27b..1c4c7246bf5e17ebb308a0dfc03758b31ac5709a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java
@@ -83,9 +83,9 @@ public interface IClientService extends RemoteService
     public DisplaySettings resetDisplaySettings();
 
     /**
-     * Changes logged user home group on the server.
+     * Changes home space of the logged-in user on the server.
      */
-    public void changeUserHomeGroup(TechId groupIdOrNull);
+    public void changeUserHomeSpace(TechId groupIdOrNull);
 
     /**
      * Logs out the user, saving his/her {@link DisplaySettings} if necessary.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java
index f51a90c97e6876adb3057484ed92126424232a16..95c6d57e71ae987e5c41c8dc13a5a9e0289cf89e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java
@@ -57,8 +57,8 @@ public interface IClientServiceAsync
     /** @see IClientService#resetDisplaySettings() */
     public void resetDisplaySettings(AsyncCallback<DisplaySettings> resetUserSettingsCallback);
 
-    /** @see IClientService#changeUserHomeGroup(TechId) */
-    public void changeUserHomeGroup(TechId groupIdOrNull, AsyncCallback<Void> callback);
+    /** @see IClientService#changeUserHomeSpace(TechId) */
+    public void changeUserHomeSpace(TechId spaceIdOrNull, AsyncCallback<Void> callback);
 
     /** @see IClientService#logout(DisplaySettings, boolean) */
     public void logout(DisplaySettings displaySettings, boolean simpleViewMode,
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java
index 5353b76e1eb8cdb1057a12288a4a221fd6f0ee93..4799bfec6fd4a4c791329c4acbd390558fe67099 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java
@@ -166,7 +166,7 @@ public class ChangeUserSettingsDialog extends AbstractSaveDialog
         String groupCodeOrNull = space == null ? null : space.getCode();
         TechId groupIdOrNull = TechId.create(space);
         viewContext.getModel().getSessionContext().getUser().setHomeGroupCode(groupCodeOrNull);
-        viewContext.getService().changeUserHomeGroup(groupIdOrNull, saveCallback);
+        viewContext.getService().changeUserHomeSpace(groupIdOrNull, saveCallback);
 
         RealNumberFormatingParameters formatingParameters = getRealNumberFormatingParameters();
         formatingParameters.setFormatingEnabled(formatingFields.isExpanded());
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index e8b1e22a66253297c7f5c9c9acf911767c40453d..d9f5980f1cb785cfe7ab4c7f2111c0f6d68ad2f4 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -665,7 +665,7 @@ public abstract class AbstractClientService implements IClientService,
     }
 
     @Override
-    public void changeUserHomeGroup(TechId groupIdOrNull)
+    public void changeUserHomeSpace(TechId groupIdOrNull)
     {
         try
         {
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
index 98ad2c16cd81e29f5712cdbd7b0cd86e3ae0320a..ad857582c1fc3f1fc124ac188e3d6d89e6342234 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java
@@ -570,7 +570,7 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest
                 }
             });
 
-        commonClientService.changeUserHomeGroup(groupId);
+        commonClientService.changeUserHomeSpace(groupId);
 
         context.assertIsSatisfied();
     }