More cleanup rename first service.