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

dependency name change, description change
Merge pull request #2 from emmairwin/7.x-dev

dependency name change, description change
Merge pull request #3 from emmairwin/7.x-dev

override updates
Updated the name and package.
Resolved conflicts.