renaming property names
Quick and dirty implementation of the wizard flow.