rename the service and fix measurement timer