diff --git a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp b/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
index e55657924..d3ef935c3 100644
--- a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
+++ b/hphp/runtime/vm/translator/hopt/vectortranslator.cpp
@@ -594,7 +594,7 @@ void HhbcTranslator::VectorTranslator::emitBaseLCR() {
 // Str key?
 bool HhbcTranslator::VectorTranslator::isSimpleArrayOp() {
   SSATmp* base = getInput(m_mii.valCount());
-  VM::Op op = m_ni.mInstrOp();
+  HPHP::VM::Op op = m_ni.mInstrOp();
   if ((op == OpSetM || op == OpCGetM || op == OpIssetM) &&
       isSimpleBase() &&
       isSingleMember() &&
@@ -1148,7 +1148,7 @@ template <KeyType keyType, bool isObj>
 static inline RefData* vGetPropImpl(Class* ctx, TypedValue* base,
                                     TypedValue keyVal, MInstrState* mis) {
   TypedValue* key = keyPtr<keyType>(keyVal);
-  TypedValue* result = VM::Prop<false, true, false, isObj, keyType>(
+  TypedValue* result = HPHP::VM::Prop<false, true, false, isObj, keyType>(
     mis->tvScratch, mis->tvRef, ctx, base, key);
 
   if (result->m_type != KindOfRef) {
@@ -1190,7 +1190,7 @@ void HhbcTranslator::VectorTranslator::emitVGetProp() {
 template <bool useEmpty, bool isObj>
 static inline bool issetEmptyPropImpl(Class* ctx, TypedValue* base,
                                       TypedValue keyVal) {
-  return VM::IssetEmptyProp<useEmpty, isObj>(ctx, base, &keyVal);
+  return HPHP::VM::IssetEmptyProp<useEmpty, isObj>(ctx, base, &keyVal);
 }
 
 #define HELPER_TABLE(m)                                         \
@@ -1231,7 +1231,7 @@ void HhbcTranslator::VectorTranslator::emitEmptyProp() {
 template <bool isObj>
 static inline TypedValue setPropImpl(Class* ctx, TypedValue* base,
                                      TypedValue keyVal, Cell val) {
-  VM::SetProp<true, isObj>(ctx, base, &keyVal, &val);
+  HPHP::VM::SetProp<true, isObj>(ctx, base, &keyVal, &val);
   return val;
 }
 
@@ -1283,7 +1283,7 @@ void HhbcTranslator::VectorTranslator::emitSetProp() {
 template <bool isObj>
 static inline TypedValue setOpPropImpl(TypedValue* base, TypedValue keyVal,
                                        Cell val, MInstrState* mis, SetOpOp op) {
-  TypedValue* result = VM::SetOpProp<isObj>(
+  TypedValue* result = HPHP::VM::SetOpProp<isObj>(
     mis->tvScratch, mis->tvRef, mis->ctx, op, base, &keyVal, &val);
 
   TypedValue ret;
@@ -1326,7 +1326,7 @@ static inline TypedValue incDecPropImpl(TypedValue* base, TypedValue keyVal,
                                         MInstrState* mis, IncDecOp op) {
   TypedValue result;
   result.m_type = KindOfUninit;
-  VM::IncDecProp<true, isObj>(
+  HPHP::VM::IncDecProp<true, isObj>(
     mis->tvScratch, mis->tvRef, mis->ctx, op, base, &keyVal, result);
   assert(result.m_type != KindOfRef);
   return result;
@@ -1365,7 +1365,7 @@ void HhbcTranslator::VectorTranslator::emitIncDecProp() {
 template <bool isObj>
 static inline void bindPropImpl(Class* ctx, TypedValue* base, TypedValue keyVal,
                                 RefData* val, MInstrState* mis) {
-  TypedValue* prop = VM::Prop<false, true, false, isObj>(
+  TypedValue* prop = HPHP::VM::Prop<false, true, false, isObj>(
     mis->tvScratch, mis->tvRef, ctx, base, &keyVal);
   if (!(prop == &mis->tvScratch && prop->m_type == KindOfUninit)) {
     tvBindRef(val, prop);
@@ -1402,7 +1402,7 @@ void HhbcTranslator::VectorTranslator::emitBindProp() {
 template <bool isObj>
 static inline void unsetPropImpl(Class* ctx, TypedValue* base,
                                  TypedValue keyVal) {
-  VM::UnsetProp<isObj>(ctx, base, &keyVal);
+  HPHP::VM::UnsetProp<isObj>(ctx, base, &keyVal);
 }
 
 #define HELPER_TABLE(m)            \
@@ -1550,7 +1550,7 @@ template <KeyType keyType>
 static inline RefData* vGetElemImpl(TypedValue* base, TypedValue keyVal,
                                     MInstrState* mis) {
   TypedValue* key = keyPtr<keyType>(keyVal);
-  TypedValue* result = VM::ElemD<false, true, keyType>(
+  TypedValue* result = HPHP::VM::ElemD<false, true, keyType>(
     mis->tvScratch, mis->tvRef, base, key);
 
   if (result->m_type != KindOfRef) {
@@ -1592,7 +1592,7 @@ static inline bool issetEmptyElemImpl(TypedValue* base, TypedValue keyVal,
   // mis == nullptr if we proved that it won't be used. mis->tvScratch and
   // mis->tvRef are ok because those params are passed by
   // reference.
-  return VM::IssetEmptyElem<isEmpty, false, keyType>(
+  return HPHP::VM::IssetEmptyElem<isEmpty, false, keyType>(
     mis->tvScratch, mis->tvRef, base, key);
 }
 
@@ -1827,7 +1827,7 @@ template <SetOpOp op>
 static inline TypedValue setOpElemImpl(TypedValue* base, TypedValue keyVal,
                                        Cell val, MInstrState* mis) {
   TypedValue* result =
-    VM::SetOpElem(mis->tvScratch, mis->tvRef, op, base, &keyVal, &val);
+    HPHP::VM::SetOpElem(mis->tvScratch, mis->tvRef, op, base, &keyVal, &val);
 
   TypedValue ret;
   tvReadCell(result, &ret);
@@ -1868,7 +1868,7 @@ template <IncDecOp op>
 static inline TypedValue incDecElemImpl(TypedValue* base, TypedValue keyVal,
                                         MInstrState* mis) {
   TypedValue result;
-  VM::IncDecElem<true>(
+  HPHP::VM::IncDecElem<true>(
     mis->tvScratch, mis->tvRef, op, base, &keyVal, result);
   assert(result.m_type != KindOfRef);
   return result;
@@ -1901,7 +1901,7 @@ void HhbcTranslator::VectorTranslator::emitIncDecElem() {
 namespace VectorHelpers {
 void bindElemC(TypedValue* base, TypedValue keyVal, RefData* val,
                MInstrState* mis) {
-  base = VM::ElemD<false, true>(mis->tvScratch, mis->tvRef, base, &keyVal);
+  base = HPHP::VM::ElemD<false, true>(mis->tvScratch, mis->tvRef, base, &keyVal);
   if (!(base == &mis->tvScratch && base->m_type == KindOfUninit)) {
     tvBindRef(val, base);
   }
@@ -1920,7 +1920,7 @@ void HhbcTranslator::VectorTranslator::emitBindElem() {
 template <KeyType keyType>
 static inline void unsetElemImpl(TypedValue* base, TypedValue keyVal) {
   TypedValue* key = keyPtr<keyType>(keyVal);
-  VM::UnsetElem<keyType>(base, key);
+  HPHP::VM::UnsetElem<keyType>(base, key);
 }
 
 #define HELPER_TABLE(m)                              \