Form refactoring & renaming