Renamed package names (shorter & lowercase)