Fixed more naming typos