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

Improved component naming.
Resolved merge conflicts.
Cleaned up components names.
Cleaned up components names.
Resolved merge conflicts
Cleaned up components names.
Merge branch 'v3.0'
Cleaned up components names.
Cleaned up components names.
Cleaned up components names.
Cleaned up components names.
Resolved merge conflicts.
Cleaned up components names.
Resolved merge conflicts.
Cleaned up components names.