- Fix a crash
 - Rename controller files correctly