Sample documentation and some renaming