Fix an issue with controller names.