Renaming controllers and templates taking shape.