Refactored a number of method names & controls loaded from json.