Rename the controller classes inside the concerns module

closes #6