up some things for services and a rename