[TASK] Rename classes with the same name