rename some services and threads more accurately