Renamed observer and controller classes