OOIION-1617: Use alternate instrument class name for preload generated model, site, device