refactor:rename class; extract class.
refactor: fix unit test problem for entity telephone.
Merge pull request #568 from forumbyr/master

refactor:rename class; extract class.