Updates to figuring out class name of controller