Renamed types
Cleaned up the references
Added new components