diff --git a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Author.Author.orm.xml b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Author.Author.orm.xml
index 0cf17b2..9c3563b 100644
--- a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Author.Author.orm.xml
+++ b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Author.Author.orm.xml
@@ -3,7 +3,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                           https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Cheeper\Chapter7\DomainModel\Author\Author" table="chapter7_authors">
+    <entity name="Cheeper\Chapter7\DomainModel\Author\Author" table="authors">
         <id name="authorId" type="string" column="author_id" length="36">
             <generator strategy="NONE"/>
         </id>
diff --git a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Cheep.Cheep.orm.xml b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Cheep.Cheep.orm.xml
index 0aa41df..bf0c232 100644
--- a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Cheep.Cheep.orm.xml
+++ b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Cheep.Cheep.orm.xml
@@ -3,7 +3,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                           https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Cheeper\Chapter7\DomainModel\Cheep\Cheep" table="chapter7_cheeps">
+    <entity name="Cheeper\Chapter7\DomainModel\Cheep\Cheep" table="cheeps">
         <id name="cheepId" column="cheep_id" type="string" length="36">
             <generator strategy="NONE"/>
         </id>
diff --git a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Follow.Follow.orm.xml b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Follow.Follow.orm.xml
index 9000288..c78ab3e 100644
--- a/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Follow.Follow.orm.xml
+++ b/src/Cheeper/Chapter7/Infrastructure/DomainModel/DoctrineMappings/Follow.Follow.orm.xml
@@ -3,7 +3,7 @@
                   xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
                           https://www.doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
 
-    <entity name="Cheeper\Chapter7\DomainModel\Follow\Follow" table="chapter7_follows">
+    <entity name="Cheeper\Chapter7\DomainModel\Follow\Follow" table="follows">
         <id name="followId" type="string" column="follow_id" length="36">
             <generator strategy="NONE"/>
         </id>