[v1.0.15] Changed names for application and base controller