Better core feature naming.
Merge pull request #7 from logoff/core/better-naming

Better core feature naming.