change some name label to be more uniform

and remove timescaling option for now