Merge pull request #2248 from reaperhulk/oid-the-rest

namespace the rest of the oids