Re-factor namings of attributes.
Apply remaining attributes/variables for use with application resource and template.