Merge pull request #3 from emmairwin/7.x-dev

Core: Naming revisions completed.