Renamed package and class names to make them shorter