Merge "rename controller.controllerName to controller.name"