Rename classes

Rename classes according to the object they axt on