[TASK] Changed Class Name for compatibility reasons