Fixed namespace issues in Migrator