Rename class
Deleting class
Rename class
Rename class
Minor fix