Refactoring entity fields and changing variable names to match those in the forms