Changed variable, controller action and method names to reflect DB hierarchy