diff --git a/Sources/CoreStoreSchema.swift b/Sources/CoreStoreSchema.swift
index 7fa7292..8d7bc82 100644
--- a/Sources/CoreStoreSchema.swift
+++ b/Sources/CoreStoreSchema.swift
@@ -268,7 +268,7 @@ public final class CoreStoreSchema: DynamicSchema {
         entityDescription.name = entity.entityName
         entityDescription.isAbstract = entity.isAbstract
         entityDescription.versionHashModifier = entity.versionHashModifier
-        entityDescription.managedObjectClassName = "\(NSStringFromClass(entity.type)).CoreStoreManagedObject"
+        entityDescription.managedObjectClassName = "\(NSStringFromClass(CoreStoreManagedObject.self)).\(NSStringFromClass(entity.type)).\(entity.entityName)"
         
         var keyPathsByAffectedKeyPaths: [KeyPath: Set<KeyPath>] = [:]
         func createProperties(for type: CoreStoreObject.Type) -> [NSPropertyDescription] {