diff --git a/data/database.py b/data/database.py
index b15f652..c6c5917 100644
--- a/data/database.py
+++ b/data/database.py
@@ -23,11 +23,11 @@ load_dotenv()
     pk == primary key
 """
 DATABASE_NAMING_CONVENTION = {
-    "ix": "ix_%(table)s_%(column_0_label)s",
-    "uq": "uq_%(table)s_%(column_0_label)s",
-    "ck": "ck_%(table)s_%(column_0_label)s",
-    "fk": "fk_%(table)s_%(column_0_label)s",
-    "pk": "pk_%(table)s_%(column_0_label)s",
+    "ix": "ix_%(column_0_label)s",
+    "uq": "uq_%(table_name)s_%(column_0_label)s",
+    "ck": "ck_%(table_name)s_%(constraint_name)s",
+    "fk": "fk_%(table_name)s_%(column_0_label)s_%(referred_table_name)s",
+    "pk": "pk_%(table_name)s",
 }
 
 class Base(DeclarativeBase):