more renames required...

fixing on merge