Typos and renames