Fix oc name collision
Merge branch 'master' of github.com:raregular/enocart-thrift