diff --git a/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/a1ead76c0470_add_sepolia.py b/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/a1ead76c0470_add_sepolia.py
index 1271322e..5bb9c5fa 100644
--- a/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/a1ead76c0470_add_sepolia.py
+++ b/moonstreamdb-v3/moonstreamdbv3/alembic_indexes/versions/a1ead76c0470_add_sepolia.py
@@ -22,7 +22,7 @@ depends_on: Union[str, Sequence[str], None] = None
 def upgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.create_table(
-        "ethereum_sepolia_blocks",
+        "sepolia_blocks",
         sa.Column("block_number", sa.BigInteger(), nullable=False),
         sa.Column("block_hash", sa.VARCHAR(length=256), nullable=False),
         sa.Column("block_timestamp", sa.BigInteger(), nullable=False),
@@ -35,43 +35,41 @@ def upgrade() -> None:
             server_default=sa.text("TIMEZONE('utc', statement_timestamp())"),
             nullable=False,
         ),
-        sa.PrimaryKeyConstraint(
-            "block_number", name=op.f("pk_ethereum_sepolia_blocks")
-        ),
+        sa.PrimaryKeyConstraint("block_number", name=op.f("pk_sepolia_blocks")),
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_blocks_block_number"),
-        "ethereum_sepolia_blocks",
+        op.f("ix_sepolia_blocks_block_number"),
+        "sepolia_blocks",
         ["block_number"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_blocks_block_timestamp"),
-        "ethereum_sepolia_blocks",
+        op.f("ix_sepolia_blocks_block_timestamp"),
+        "sepolia_blocks",
         ["block_timestamp"],
         unique=False,
     )
     op.create_table(
-        "ethereum_sepolia_reorgs",
+        "sepolia_reorgs",
         sa.Column("id", sa.UUID(), nullable=False),
         sa.Column("block_number", sa.BigInteger(), nullable=False),
         sa.Column("block_hash", sa.VARCHAR(length=256), nullable=False),
-        sa.PrimaryKeyConstraint("id", name=op.f("pk_ethereum_sepolia_reorgs")),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_sepolia_reorgs")),
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_reorgs_block_hash"),
-        "ethereum_sepolia_reorgs",
+        op.f("ix_sepolia_reorgs_block_hash"),
+        "sepolia_reorgs",
         ["block_hash"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_reorgs_block_number"),
-        "ethereum_sepolia_reorgs",
+        op.f("ix_sepolia_reorgs_block_number"),
+        "sepolia_reorgs",
         ["block_number"],
         unique=False,
     )
     op.create_table(
-        "ethereum_sepolia_transactions",
+        "sepolia_transactions",
         sa.Column("block_number", sa.BigInteger(), nullable=False),
         sa.Column("hash", sa.VARCHAR(length=256), nullable=False),
         sa.Column("from_address", sa.LargeBinary(length=20), nullable=False),
@@ -90,64 +88,62 @@ def upgrade() -> None:
         ),
         sa.ForeignKeyConstraint(
             ["block_number"],
-            ["ethereum_sepolia_blocks.block_number"],
-            name=op.f(
-                "fk_ethereum_sepolia_transactions_block_number_ethereum_sepolia_blocks"
-            ),
+            ["sepolia_blocks.block_number"],
+            name=op.f("fk_sepolia_transactions_block_number_sepolia_blocks"),
             ondelete="CASCADE",
         ),
-        sa.PrimaryKeyConstraint("hash", name=op.f("pk_ethereum_sepolia_transactions")),
+        sa.PrimaryKeyConstraint("hash", name=op.f("pk_sepolia_transactions")),
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_block_hash"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_block_hash"),
+        "sepolia_transactions",
         ["block_hash"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_block_number"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_block_number"),
+        "sepolia_transactions",
         ["block_number"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_from_address"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_from_address"),
+        "sepolia_transactions",
         ["from_address"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_hash"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_hash"),
+        "sepolia_transactions",
         ["hash"],
         unique=True,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_index"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_index"),
+        "sepolia_transactions",
         ["index"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_selector"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_selector"),
+        "sepolia_transactions",
         ["selector"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_to_address"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_to_address"),
+        "sepolia_transactions",
         ["to_address"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_transactions_type"),
-        "ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_type"),
+        "sepolia_transactions",
         ["type"],
         unique=False,
     )
     op.create_table(
-        "ethereum_sepolia_logs",
+        "sepolia_logs",
         sa.Column("transaction_hash", sa.VARCHAR(length=256), nullable=False),
         sa.Column("block_hash", sa.VARCHAR(length=256), nullable=False),
         sa.Column("address", sa.LargeBinary(length=20), nullable=False),
@@ -166,48 +162,46 @@ def upgrade() -> None:
         ),
         sa.ForeignKeyConstraint(
             ["transaction_hash"],
-            ["ethereum_sepolia_transactions.hash"],
-            name=op.f(
-                "fk_ethereum_sepolia_logs_transaction_hash_ethereum_sepolia_transactions"
-            ),
+            ["sepolia_transactions.hash"],
+            name=op.f("fk_sepolia_logs_transaction_hash_sepolia_transactions"),
             ondelete="CASCADE",
         ),
         sa.PrimaryKeyConstraint(
-            "transaction_hash", "log_index", name="pk_ethereum_sepolia_log_index"
+            "transaction_hash", "log_index", name="pk_sepolia_log_index"
         ),
         sa.UniqueConstraint(
             "transaction_hash",
             "log_index",
-            name="uq_ethereum_sepolia_log_index_transaction_hash_log_index",
+            name="uq_sepolia_log_index_transaction_hash_log_index",
         ),
     )
     op.create_index(
-        "idx_ethereum_sepolia_logs_address_selector",
-        "ethereum_sepolia_logs",
+        "idx_sepolia_logs_address_selector",
+        "sepolia_logs",
         ["address", "selector"],
         unique=False,
     )
     op.create_index(
-        "idx_ethereum_sepolia_logs_block_hash_log_index",
-        "ethereum_sepolia_logs",
+        "idx_sepolia_logs_block_hash_log_index",
+        "sepolia_logs",
         ["block_hash", "log_index"],
         unique=True,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_logs_address"),
-        "ethereum_sepolia_logs",
+        op.f("ix_sepolia_logs_address"),
+        "sepolia_logs",
         ["address"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_logs_block_hash"),
-        "ethereum_sepolia_logs",
+        op.f("ix_sepolia_logs_block_hash"),
+        "sepolia_logs",
         ["block_hash"],
         unique=False,
     )
     op.create_index(
-        op.f("ix_ethereum_sepolia_logs_transaction_hash"),
-        "ethereum_sepolia_logs",
+        op.f("ix_sepolia_logs_transaction_hash"),
+        "sepolia_logs",
         ["transaction_hash"],
         unique=False,
     )
@@ -217,72 +211,66 @@ def upgrade() -> None:
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
     op.drop_index(
-        op.f("ix_ethereum_sepolia_logs_transaction_hash"),
-        table_name="ethereum_sepolia_logs",
+        op.f("ix_sepolia_logs_transaction_hash"),
+        table_name="sepolia_logs",
+    )
+    op.drop_index(op.f("ix_sepolia_logs_block_hash"), table_name="sepolia_logs")
+    op.drop_index(op.f("ix_sepolia_logs_address"), table_name="sepolia_logs")
+    op.drop_index(
+        "idx_sepolia_logs_block_hash_log_index",
+        table_name="sepolia_logs",
+    )
+    op.drop_index("idx_sepolia_logs_address_selector", table_name="sepolia_logs")
+    op.drop_table("sepolia_logs")
+    op.drop_index(
+        op.f("ix_sepolia_transactions_type"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_logs_block_hash"), table_name="ethereum_sepolia_logs"
+        op.f("ix_sepolia_transactions_to_address"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_logs_address"), table_name="ethereum_sepolia_logs"
+        op.f("ix_sepolia_transactions_selector"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        "idx_ethereum_sepolia_logs_block_hash_log_index",
-        table_name="ethereum_sepolia_logs",
+        op.f("ix_sepolia_transactions_index"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        "idx_ethereum_sepolia_logs_address_selector", table_name="ethereum_sepolia_logs"
-    )
-    op.drop_table("ethereum_sepolia_logs")
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_type"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_hash"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_to_address"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_from_address"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_selector"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_block_number"),
+        table_name="sepolia_transactions",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_index"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_transactions_block_hash"),
+        table_name="sepolia_transactions",
+    )
+    op.drop_table("sepolia_transactions")
+    op.drop_index(
+        op.f("ix_sepolia_reorgs_block_number"),
+        table_name="sepolia_reorgs",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_hash"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_reorgs_block_hash"),
+        table_name="sepolia_reorgs",
+    )
+    op.drop_table("sepolia_reorgs")
+    op.drop_index(
+        op.f("ix_sepolia_blocks_block_timestamp"),
+        table_name="sepolia_blocks",
     )
     op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_from_address"),
-        table_name="ethereum_sepolia_transactions",
+        op.f("ix_sepolia_blocks_block_number"),
+        table_name="sepolia_blocks",
     )
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_block_number"),
-        table_name="ethereum_sepolia_transactions",
-    )
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_transactions_block_hash"),
-        table_name="ethereum_sepolia_transactions",
-    )
-    op.drop_table("ethereum_sepolia_transactions")
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_reorgs_block_number"),
-        table_name="ethereum_sepolia_reorgs",
-    )
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_reorgs_block_hash"),
-        table_name="ethereum_sepolia_reorgs",
-    )
-    op.drop_table("ethereum_sepolia_reorgs")
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_blocks_block_timestamp"),
-        table_name="ethereum_sepolia_blocks",
-    )
-    op.drop_index(
-        op.f("ix_ethereum_sepolia_blocks_block_number"),
-        table_name="ethereum_sepolia_blocks",
-    )
-    op.drop_table("ethereum_sepolia_blocks")
+    op.drop_table("sepolia_blocks")
     # ### end Alembic commands ###
diff --git a/moonstreamdb-v3/moonstreamdbv3/models_indexes.py b/moonstreamdb-v3/moonstreamdbv3/models_indexes.py
index d0802857..4afb8d2b 100644
--- a/moonstreamdb-v3/moonstreamdbv3/models_indexes.py
+++ b/moonstreamdb-v3/moonstreamdbv3/models_indexes.py
@@ -154,15 +154,15 @@ class EthereumReorgs(EvmBasedReorgs):
 
 
 class SepoliaBlockIndex(EvmBasedBlocks):
-    __tablename__ = "ethereum_sepolia_blocks"
+    __tablename__ = "sepolia_blocks"
 
 
 class SepoliaTransactionIndex(EvmBasedTransactions):
-    __tablename__ = "ethereum_sepolia_transactions"
+    __tablename__ = "sepolia_transactions"
 
     block_number = Column(
         BigInteger,
-        ForeignKey("ethereum_sepolia_blocks.block_number", ondelete="CASCADE"),
+        ForeignKey("sepolia_blocks.block_number", ondelete="CASCADE"),
         nullable=False,
         index=True,
     )
@@ -170,17 +170,17 @@ class SepoliaTransactionIndex(EvmBasedTransactions):
 
 class SepoliaLogIndex(EvmBasedLogs):
 
-    __tablename__ = "ethereum_sepolia_logs"
+    __tablename__ = "sepolia_logs"
 
     __table_args__ = (
         Index(
-            "idx_ethereum_sepolia_logs_address_selector",
+            "idx_sepolia_logs_address_selector",
             "address",
             "selector",
             unique=False,
         ),
         Index(
-            "idx_ethereum_sepolia_logs_block_hash_log_index",
+            "idx_sepolia_logs_block_hash_log_index",
             "block_hash",
             "log_index",
             unique=True,
@@ -188,22 +188,22 @@ class SepoliaLogIndex(EvmBasedLogs):
         UniqueConstraint(
             "transaction_hash",
             "log_index",
-            name="uq_ethereum_sepolia_log_index_transaction_hash_log_index",
+            name="uq_sepolia_log_index_transaction_hash_log_index",
         ),
         PrimaryKeyConstraint(
-            "transaction_hash", "log_index", name="pk_ethereum_sepolia_log_index"
+            "transaction_hash", "log_index", name="pk_sepolia_log_index"
         ),
     )
     transaction_hash = Column(
         VARCHAR(256),
-        ForeignKey("ethereum_sepolia_transactions.hash", ondelete="CASCADE"),
+        ForeignKey("sepolia_transactions.hash", ondelete="CASCADE"),
         nullable=False,
         index=True,
     )
 
 
 class SepoliaReorgs(EvmBasedReorgs):
-    __tablename__ = "ethereum_sepolia_reorgs"
+    __tablename__ = "sepolia_reorgs"
 
 
 ### Polygon