diff --git a/jirm-orm/src/main/java/co/jirm/mapper/definition/DefaultNamingStrategy.java b/jirm-orm/src/main/java/co/jirm/mapper/definition/DefaultNamingStrategy.java
index cff16e3..1db4d67 100644
--- a/jirm-orm/src/main/java/co/jirm/mapper/definition/DefaultNamingStrategy.java
+++ b/jirm-orm/src/main/java/co/jirm/mapper/definition/DefaultNamingStrategy.java
@@ -36,7 +36,7 @@ public class DefaultNamingStrategy implements NamingStrategy, Serializable {
 	 * underscores
 	 */
 	public String classToTableName(String className) {
-		return addUnderscores( unqualify(className) );
+		return addUnderscores( unqualify(className).replaceAll("$", "_inter_") );
 	}
 	/**
 	 * Return the full property path with underscore seperators, mixed
diff --git a/jirm-orm/src/main/java/co/jirm/mapper/definition/SqlObjectDefinition.java b/jirm-orm/src/main/java/co/jirm/mapper/definition/SqlObjectDefinition.java
index 05d9446..b67fa19 100644
--- a/jirm-orm/src/main/java/co/jirm/mapper/definition/SqlObjectDefinition.java
+++ b/jirm-orm/src/main/java/co/jirm/mapper/definition/SqlObjectDefinition.java
@@ -82,7 +82,7 @@ private SqlObjectDefinition(SqlObjectConfig config, Class<T> objectType, Map<Str
 			sqlName = t.name();
 		}
 		else {
-			sqlName = config.getNamingStrategy().classToTableName(objectType.getCanonicalName());
+			sqlName = config.getNamingStrategy().classToTableName(objectType.getName());
 		}
 	}