name refactor
Merge pull request #18 from frmwork/name_refactor

name refactor