Changed names for classes to normal view