Renames and better docs