Renaming stuff for clarity and spelling.