forms refactoring
classes have been renamed