Improved component naming.
Merge pull request #1911 from pjackson28/v3.0

Improved component naming.