diff --git a/sample-management-custom/caosdb-server/caosdb-webui/build.properties.d/50.sample-management.conf b/sample-management-custom/caosdb-server/caosdb-webui/build.properties.d/50.sample-management.conf
index 9f114ce7b2d25203fb10063f1fe9c1d9f0aebaaa..6727bd1ff64c2dbb8add5a605ba9ed0a8f6e0d8a 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/build.properties.d/50.sample-management.conf
+++ b/sample-management-custom/caosdb-server/caosdb-webui/build.properties.d/50.sample-management.conf
@@ -23,7 +23,7 @@ BUILD_MODULE_EXT_SSS_MARKDOWN=ENABLED
 BUILD_MODULE_SHOW_ID_IN_LABEL=ENABLED
 
 # sample-management specific variables
-BUILD_MODULE_EXT_BIS_SAMPLEMANAGEMENT=ENABLED
+BUILD_MODULE_EXT_SAMPLEMANAGEMENT=ENABLED
 BUILD_MODULE_EXT_STOCKMANAGEMENT=ENABLED
 BUILD_MODULE_EXT_SAMPLEMANGEMENT_ID_LABEL="Sample ID"
 BUILD_MODULE_EXT_STOCKMANAGEMENT_ID_LABEL="Container ID"
\ No newline at end of file
diff --git a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js
index 09c64a868524f91d193244608036bc0f9ece8bf5..27a94946300025f6ca2219eb62da1cf402316b58 100644
--- a/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js
+++ b/sample-management-custom/caosdb-server/caosdb-webui/src/ext/js/ext_bis_samplemanagemet.js
@@ -6,9 +6,9 @@
 'use strict';
 
 /**
- * This module adds to forms to BIS that relate to sample management.
- * One form allows to register samples.
- * The other allows to update registered samples.
+ * This module adds to forms to LinkAhead that relate to sample
+ * management; there are forms for sample registration, upload, and
+ * export.
  *
  * @module ext_flight_preview
  * @version 0.1
@@ -16,7 +16,7 @@
  * @requires nothing yet
  * (pass the dependencies as arguments)
  */
-const ext_bis_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) {
+const ext_samplemanagement = function($, navbar, log, form_elements, form_panel, bis_custom_reference_resolver) {
     const logger = log.getLogger("samplemanagement_form");
     const tool_box = "Sample Management"
     const upload_sample_template_title = "Upload sample template"; // title of the form and text in the toolbox
@@ -424,7 +424,7 @@ $(document).ready(function() {
     // use a variable starting with `BUILD_MODULE_` to enable your module
     // the build variable has to be enabled in the `build.properties.d/` directory.
     // Otherwise the module will not be activated.
-    if ("${BUILD_MODULE_EXT_BIS_SAMPLEMANAGEMENT}" === "ENABLED") {
-        caosdb_modules.register(ext_bis_samplemanagement);
+    if ("${BUILD_MODULE_EXT_SAMPLEMANAGEMENT}" === "ENABLED") {
+        caosdb_modules.register(ext_samplemanagement);
     }
 });
diff --git a/sample-management-custom/caosdb-server/scripting/bin/register_new_samples.py b/sample-management-custom/caosdb-server/scripting/bin/register_new_samples.py
index 5ce31108d68738e1162164d7fcc5636ff8c7a07f..a93d78e639ba8cc24bd2b52b59a5103e37cd5efc 100755
--- a/sample-management-custom/caosdb-server/scripting/bin/register_new_samples.py
+++ b/sample-management-custom/caosdb-server/scripting/bin/register_new_samples.py
@@ -65,7 +65,6 @@ def get_column_names(data):
 def create_sample_entities(data):
     responsible_person_id = get_responsible_person_id(data)
     number_of_samples = get_number_of_samples(data)
-    add_state = len(db.execute_query("FIND 'Sample life-cycle'"))
 
     batch = db.Container()
     for index in range(number_of_samples):
@@ -73,9 +72,6 @@ def create_sample_entities(data):
         sample.add_parent(name="Sample")
         sample.add_property(name="Main User", value=responsible_person_id)
         sample.add_property("Container")
-        sample.add_property("NagoyaCase")
-        if add_state:
-            sample.state = db.State(name="Registered", model="Sample life-cycle")
         batch += [sample]
     batch = post_process_samples(batch)
     batch.insert()