rename some functions; pretty much nothing else.