more renaming
tweaks and fiddling