OOIION-1617: Use alternate instrument class name for preload generated model, site, device
Merge pull request #1653 from mmeisinger/fix1617_pre_r2

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