Refactoring to more generic controller/class names.