diff --git a/templates/machine.swift.motemplate b/templates/machine.swift.motemplate
index 1f48e395..a34a2d11 100644
--- a/templates/machine.swift.motemplate
+++ b/templates/machine.swift.motemplate
@@ -32,7 +32,7 @@ class _<$managedObjectClassName$>: <$customSuperentity$> {
 
     /// pragma mark - Class methods
     
-    class func entityName () -> String {
+    <$if hasCustomSuperentity$>override <$endif$>class func entityName () -> String {
         return "<$name$>"
     }