Renamed componenets
Renamed components
Revert "Renamed components"

This reverts commit cc955cfd4c45edd8bd183d8c6f2db6616b5d234d.