Fix typos from rename