Fixed typos from previous renaming that was not complete.