diff --git a/spinedb_api/__init__.py b/spinedb_api/__init__.py
index d9f3f9b7..e968a911 100644
--- a/spinedb_api/__init__.py
+++ b/spinedb_api/__init__.py
@@ -12,4 +12,4 @@
     RelationshipClassMapping, DataMapping, read_with_mapping
 from .version import __version__
 
-name = "spine_dbapi"
+name = "spinedb_api"
diff --git a/spinedb_api/database_mapping.py b/spinedb_api/database_mapping.py
index a134706f..e6c2eda7 100644
--- a/spinedb_api/database_mapping.py
+++ b/spinedb_api/database_mapping.py
@@ -109,7 +109,7 @@ def check_db_version(self, upgrade=False):
         If upgrade is True, then don't raise the error and upgrade the database instead.
         """
         config = Config()
-        config.set_main_option("script_location", "spine_dbapi:alembic")
+        config.set_main_option("script_location", "spinedb_api:alembic")
         script = ScriptDirectory.from_config(config)
         head = script.get_current_head()
         with self.engine.connect() as connection:
diff --git a/spinedb_api/helpers.py b/spinedb_api/helpers.py
index f0069d66..6a24da68 100644
--- a/spinedb_api/helpers.py
+++ b/spinedb_api/helpers.py
@@ -46,7 +46,7 @@
 
 def is_head(db_url):
     config = Config()
-    config.set_main_option("script_location", "spine_dbapi:alembic")
+    config.set_main_option("script_location", "spinedb_api:alembic")
     script = ScriptDirectory.from_config(config)
     head = script.get_current_head()
     engine = create_engine(db_url)
@@ -58,7 +58,7 @@ def is_head(db_url):
 
 def upgrade_to_head(db_url):
     config = Config()
-    config.set_main_option("script_location", "spine_dbapi:alembic")
+    config.set_main_option("script_location", "spinedb_api:alembic")
     script = ScriptDirectory.from_config(config)
     engine = create_engine(db_url)
     with engine.connect() as connection:
@@ -80,7 +80,7 @@ def upgrade_to_head(rev, context):
 
 def downgrade_to_base(db_url):
     config = Config()
-    config.set_main_option("script_location", "spine_dbapi:alembic")
+    config.set_main_option("script_location", "spinedb_api:alembic")
     script = ScriptDirectory.from_config(config)
     engine = create_engine(db_url)
     with engine.connect() as connection:
diff --git a/spinedb_api/import_functions.py b/spinedb_api/import_functions.py
index 01c82460..82168aea 100644
--- a/spinedb_api/import_functions.py
+++ b/spinedb_api/import_functions.py
@@ -120,7 +120,7 @@ def import_object_classes(db_map, object_classes):
             import_objects(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (Iterable): list/set/iterable of object class names (strings) to import
 
     Returns:
@@ -148,7 +148,7 @@ def import_objects(db_map, object_data):
             import_objects(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  object name and object class name
 
@@ -184,7 +184,7 @@ def import_relationship_classes(db_map, relationship_classes):
             import_relationship_classes(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  relationship class names and list of object class names
 
@@ -225,7 +225,7 @@ def import_object_parameters(db_map, parameter_data):
             import_object_parameters(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  object class name and parameter name
 
@@ -270,7 +270,7 @@ def import_relationship_parameters(db_map, parameter_data):
             import_object_parameters(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  relationship class name and parameter name
 
@@ -312,7 +312,7 @@ def import_relationships(db_map, relationship_data):
             import_object_parameters(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  relationship class name and list of object names
 
@@ -366,7 +366,7 @@ def import_object_parameter_values(db_map, data):
             import_object_parameter_values(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to
             insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
             object_class_name, object name, parameter name, field name,
@@ -457,7 +457,7 @@ def import_relationship_parameter_values(db_map, data):
             import_relationship_parameter_values(db_map, data)
 
     Args:
-        db (spine_dbapi.DiffDatabaseMapping): mapping for database to insert into
+        db (spinedb_api.DiffDatabaseMapping): mapping for database to insert into
         data (List[List/Tuple]): list/set/iterable of lists/tuples with
                                  relationship class name, list of object names, parameter name, field name,
                                  parameter value