Renamed interfaces (local), added some comments and componenttypes