final naming switches
Merge branch 'master' of https://github.com/SBRG/ome