more typos due to renaming