Renaming controllers and design