Renamed package and class name