Controller separating and renaming