Fix duplicate f21/fcr21/vf21
Merge pull request #284 from Kingcom/RegisterNames

Fix duplicate register names