Fixed name typo
Fixed more name typos