Some renames and cleanups