Updated base2.py to new service names