Renames and fix documentation