diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
index 1d60db829ee9ee539e742969fbf1e46135f9daac..8a27b1bb821ebb0feb82a21f967d662bd5d5ff89 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/gui/DataSetUploadClientModel.java
@@ -513,7 +513,7 @@ public class DataSetUploadClientModel
     public void addUnofficialVocabularyTerm(Vocabulary vocabulary, String code, String label,
             String description, Long previousTermOrdinal)
     {
-        openBISService.addUnofficialVocabularyTerm(TechId.create(vocabulary), code, label,
+        openBISService.addAdHocVocabularyTerm(TechId.create(vocabulary), code, label,
                 description, previousTermOrdinal);
         dataSetTypes = openBISService.listDataSetTypes();
         vocabularyTerms = openBISService.getVocabularyTermsMap();
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
index c43a4450d82b04df0787d070cf05d5c47d8e9052..75e0bbfe740b73bab7f8ad659becb243722f666f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/IOpenbisServiceFacade.java
@@ -63,7 +63,7 @@ public interface IOpenbisServiceFacade extends ISimpleOpenbisServiceFacade
     public List<DataSet> listDataSets(List<Sample> samples, EnumSet<Connections> connectionsToGet);
 
     /**
-     * Adds new unofficial (ad-hoc) terms to a vocabulary starting from specified ordinal + 1.
+     * Adds new ad-hoc terms to a vocabulary starting from specified ordinal + 1.
      * 
      * @param vocabularyId The id of vocabulary which should be extended.
      * @param code Code of new vocabulary term.
@@ -72,7 +72,7 @@ public interface IOpenbisServiceFacade extends ISimpleOpenbisServiceFacade
      * @param previousTermOrdinal new vocabulary term will be placed right after vocabulary term
      *            with given ordinal number.
      */
-    public void addUnofficialVocabularyTerm(TechId vocabularyId, String code, String label,
+    public void addAdHocVocabularyTerm(TechId vocabularyId, String code, String label,
             String description, Long previousTermOrdinal);
 
     /**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
index 55e9ce157c8e1d36387c7b0a7dda2c63335d3fcd..d1f2a2828cb49c71f6d37daa024a7e6d92040aad 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/OpenbisServiceFacade.java
@@ -451,7 +451,7 @@ public class OpenbisServiceFacade implements IOpenbisServiceFacade
         return convertedDataSets;
     }
 
-    public void addUnofficialVocabularyTerm(TechId vocabularyId, String code, String label,
+    public void addAdHocVocabularyTerm(TechId vocabularyId, String code, String label,
             String description, Long previousTermOrdinal)
     {
         changingService.addUnofficialVocabularyTerm(sessionToken, vocabularyId, code, label,