renames and cleanups