bunch of renames and changes