Renamed Instrument module and files