diff --git a/moto/backend_index.py b/moto/backend_index.py
index 83c12602d54d..c413f928852b 100644
--- a/moto/backend_index.py
+++ b/moto/backend_index.py
@@ -1,4 +1,4 @@
-# autogenerated by /Users/oxh252/workspace/moto_contribution/moto/scripts/update_backend_index.py
+# autogenerated by moto/scripts/update_backend_index.py
 import re
 
 backend_url_patterns = [
@@ -127,7 +127,7 @@
     ("ram", re.compile("https?://ram\\.(.+)\\.amazonaws.com")),
     ("rds", re.compile("https?://rds\\.(.+)\\.amazonaws\\.com")),
     ("rds", re.compile("https?://rds\\.amazonaws\\.com")),
-    ("rds-data", re.compile("https?://rds-data\\.(.+)\\.amazonaws\\.com")),
+    ("rdsdata", re.compile("https?://rds-data\\.(.+)\\.amazonaws\\.com")),
     ("redshift", re.compile("https?://redshift\\.(.+)\\.amazonaws\\.com")),
     ("redshiftdata", re.compile("https?://redshift-data\\.(.+)\\.amazonaws\\.com")),
     ("rekognition", re.compile("https?://rekognition\\.(.+)\\.amazonaws\\.com")),
diff --git a/scripts/scaffold.py b/scripts/scaffold.py
index eff34751d757..1f1edabf61d5 100755
--- a/scripts/scaffold.py
+++ b/scripts/scaffold.py
@@ -37,7 +37,7 @@
 import boto3
 
 from moto.core.responses import BaseResponse
-from moto.core import BaseBackend
+from moto.core.base_backend import BaseBackend
 from inflection import singularize
 from implementation_coverage import get_moto_implementation
 
diff --git a/scripts/template/lib/models.py.j2 b/scripts/template/lib/models.py.j2
index 1d339a2d0956..1d67d588f499 100644
--- a/scripts/template/lib/models.py.j2
+++ b/scripts/template/lib/models.py.j2
@@ -1,6 +1,7 @@
 """{{ service_class }}Backend class with methods for supported APIs."""
 
-from moto.core import BaseBackend, BackendDict, BaseModel
+from moto.core.base_backend import BaseBackend, BackendDict
+from moto.core.common_models import BaseModel
 
 
 class {{ service_class }}Backend(BaseBackend):