Clean up controller naming