Bunch of renames and type cleanups