Core-1933 Changed names in Application Controller