rename and touch up.
Merge pull request #224 from rdodev/master

rename and touch up.