Renaming and some documentation