[CLEANUP] Fixed some wrong spelled names

The replacement of the instances still need to be verified by someone else