Renamed packages for models and services