rename datatype
correct grammar
Merge remote-tracking branch 'origin/master'