Fixed several typo in R8.x module support code