Renamed Sensor base classes