migrated to renamed classes