some renaming and documentation