Renamed component and some other minor naming fixes