more renames...

fixing on merge