diff --git a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java b/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java
index 80011660..2b99608c 100644
--- a/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java
+++ b/src/main/java/tech/ailef/snapadmin/external/dbmapping/DbObjectSchema.java
@@ -148,7 +148,10 @@ public SnapAdmin getSnapAdmin() {
 	public Class<?> getJavaClass() {
 		return entityClass;
 	}
-	
+
+	public String getJavaClassSimpleName(){
+		return entityClass.getSimpleName();
+	}
 	/**
 	 * Returns the name of the Java class for the underlying `@Entity` this schema
 	 * corresponds to
diff --git a/src/main/resources/templates/snapadmin/model/create.html b/src/main/resources/templates/snapadmin/model/create.html
index aa09675f..750bc73f 100644
--- a/src/main/resources/templates/snapadmin/model/create.html
+++ b/src/main/resources/templates/snapadmin/model/create.html
@@ -16,7 +16,7 @@ <h1 class="fw-bold mb-4">
 						<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities </a></span>
 						<i class="align-middle bi bi-chevron-double-right"></i> 
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|">
-						 [[ ${schema.getJavaClass().getSimpleName()} ]] </a>
+						 [[ ${schema.javaClassSimpleName} ]] </a>
 						<i class="align-middle bi bi-chevron-double-right"></i> 
 						<span class="align-middle" th:text="${create ? 'Create' : 'Edit'}"></span>
 						<th:block th:if="${!create}">
@@ -27,7 +27,7 @@ <h1 class="fw-bold mb-4">
 		    		<div class="row mt-4">
 		    			<div class="col">
 		    				<div class="box">
-								<h3 class="fw-bold mb-4" th:text="${create ? schema.getJavaClass().getSimpleName() : object.getDisplayName()}"></h3>
+								<h3 class="fw-bold mb-4" th:text="${create ? schema.javaClassSimpleName : object.getDisplayName()}"></h3>
 		        				<form class="form" enctype="multipart/form-data" method="post" th:action="|/${snapadmin_baseUrl}/model/${className}/create|">
 		        					<input type="hidden" name="__snapadmin_create" th:value="${create}">
 									<div th:each="field : ${schema.getSortedFields(false)}" class="mt-2"
diff --git a/src/main/resources/templates/snapadmin/model/list.html b/src/main/resources/templates/snapadmin/model/list.html
index fd59aed3..3bb6b547 100644
--- a/src/main/resources/templates/snapadmin/model/list.html
+++ b/src/main/resources/templates/snapadmin/model/list.html
@@ -104,7 +104,7 @@ <h5 class="fw-bold mt-3">Export format</h3>
 					<h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 						<span class="align-middle"><a th:href="|/${snapadmin_baseUrl}|">Entities</a></span> 
 						<i class="align-middle bi bi-chevron-double-right"></i> 
-						<span class="align-middle"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+						<span class="align-middle"> [[ ${schema.getJavaClassSimpleName} ]] </span>
 					</h1>
 		    		<div class="row mt-4">
 		    			<div th:class="${schema.getFilterableFields().isEmpty() ? 'col' : 'col-9'}">
@@ -147,7 +147,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 		    					
 		    					
 									<h3 class="fw-bold mb-4 align-baseline flex-grow-1">
-										<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+										<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
 										<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
 											[[ ${schema.getTableName()} ]]
 										</span>
diff --git a/src/main/resources/templates/snapadmin/model/schema.html b/src/main/resources/templates/snapadmin/model/schema.html
index 71ab655d..cff2cc91 100644
--- a/src/main/resources/templates/snapadmin/model/schema.html
+++ b/src/main/resources/templates/snapadmin/model/schema.html
@@ -12,7 +12,7 @@
 					<h1 class="fw-bold mb-4"><i class="bi bi-database"></i> 
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a> 
 						<i class="align-middle bi bi-chevron-double-right"></i>
-						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.getJavaClass().getSimpleName()} ]]</a>
+						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> [[ ${schema.javaClassSimpleName } ]]</a>
 						<i class="align-middle bi bi-chevron-double-right"></i><span class="align-middle"> Schema</span>
 					</h1>
 		    		<div class="row mt-4">
@@ -34,7 +34,7 @@ <h1 class="fw-bold mb-4"><i class="bi bi-database"></i>
 		    				<div class="box with-navigation">
 		    					<div class="d-flex justify-content-between">
 									<h3 class="fw-bold align-baseline">
-										<span title="Java class name"> [[ ${schema.getJavaClass().getSimpleName()} ]] </span>
+										<span title="Java class name"> [[ ${schema.javaClassSimpleName} ]] </span>
 										<span title="Database table name" class="ms-3 label label-primary label-gray font-monospace">
 											[[ ${schema.getTableName()} ]]
 										</span>
diff --git a/src/main/resources/templates/snapadmin/model/show.html b/src/main/resources/templates/snapadmin/model/show.html
index 42dc3800..337107cc 100644
--- a/src/main/resources/templates/snapadmin/model/show.html
+++ b/src/main/resources/templates/snapadmin/model/show.html
@@ -13,7 +13,7 @@ <h1 class="fw-bold mb-4"><i class="align-middle bi bi-database"></i>
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}|">Entities</a> 
 						<i class="align-middle bi bi-chevron-double-right"></i>
 						<a class="align-middle" th:href="|/${snapadmin_baseUrl}/model/${schema.getJavaClass().getName()}|"> 
-						[[ ${schema.getJavaClass().getSimpleName()} ]]</a>
+						[[ ${schema.javaClassSimpleName } ]]</a>
 						<i class="align-middle bi bi-chevron-double-right"></i>
 						<span class="align-middle"> [[ ${object.getDisplayName()} ]]</span>
 					</h1>