diff --git a/generator/lib/behavior/versionable/VersionableBehaviorObjectBuilderModifier.php b/generator/lib/behavior/versionable/VersionableBehaviorObjectBuilderModifier.php
index f733ebb88..a658baa4a 100755
--- a/generator/lib/behavior/versionable/VersionableBehaviorObjectBuilderModifier.php
+++ b/generator/lib/behavior/versionable/VersionableBehaviorObjectBuilderModifier.php
@@ -107,7 +107,7 @@ public function postDelete($builder)
 		if (!$builder->getPlatform()->supportsNativeDeleteTrigger() && !$builder->getBuildProperty('emulateForeignKeyConstraints')) {
 			$script = "// emulate delete cascade
 {$this->getVersionQueryClassName()}::create()
-	->filterBy{$this->getActiveRecordClassName()}(\$this)
+	->filterBy{$this->table->getPhpName()}(\$this)
 	->delete(\$con);";
 			return $script;
 		}
@@ -225,7 +225,7 @@ public function addVersion(\$con = null)
 	\$version->set" . $col->getPhpName() . "(\$this->" . strtolower($col->getName()) . ");";
 		}
 		$script .= "
-	\$version->set{$this->getActiveRecordClassName()}(\$this);";
+	\$version->set{$this->table->getPhpName()}(\$this);";
 		foreach ($this->behavior->getVersionableFks() as $fk) {
 			$fkGetter = $this->builder->getFKPhpNameAffix($fk, $plural = false);
 			$fkVersionColumnName = $fk->getLocalColumnName() . '_version';
@@ -368,7 +368,7 @@ protected function addGetLastVersionNumber(&$script)
 public function getLastVersionNumber(\$con = null)
 {
 	\$v = {$this->getVersionQueryClassName()}::create()
-		->filterBy{$this->getActiveRecordClassName()}(\$this)
+		->filterBy{$this->table->getPhpName()}(\$this)
 		->orderBy{$this->getColumnPhpName()}('desc')
 		->findOne(\$con);
 	if (!\$v) {
@@ -411,7 +411,7 @@ protected function addGetOneVersion(&$script)
 public function getOneVersion(\$versionNumber, \$con = null)
 {
 	return {$this->getVersionQueryClassName()}::create()
-		->filterBy{$this->getActiveRecordClassName()}(\$this)
+		->filterBy{$this->table->getPhpName()}(\$this)
 		->filterBy{$this->getColumnPhpName()}(\$versionNumber)
 		->findOne(\$con);
 }