Enhanced naming for OOI data products and devices
Merge pull request #2094 from mmeisinger/fix_prenames

TOOLS: Enhanced naming for OOI data products and devices