Redid the naming scheme in OIMap, in case we end up using it at some
point.