Doctrine 1

Fix issue with model builder and class prefix files still prefixing table class files