Fixes up some naming conventions and removes need to instantiate another umbraco helper