Changed class and action to english names