More typos due to renaming