renaming and docs