rename from js/src/vm/ObjectImpl-inl.h
rename to js/src/vm/NativeObject-inl.h
--- a/js/src/vm/ObjectImpl-inl.h
+++ b/js/src/vm/NativeObject-inl.h
@@ -1,18 +1,18 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef vm_ObjectImpl_inl_h
-#define vm_ObjectImpl_inl_h
+#ifndef vm_NativeObject_inl_h
+#define vm_NativeObject_inl_h
 
-#include "vm/ObjectImpl.h"
+#include "vm/NativeObject.h"
 
 #include "jscntxt.h"
 
 #include "builtin/TypedObject.h"
 #include "proxy/Proxy.h"
 #include "vm/ProxyObject.h"
 #include "vm/TypedArrayObject.h"
 
@@ -683,9 +683,9 @@ DefineNativeProperty(ExclusiveContext *c
 } // namespace js
 
 inline uint8_t *
 JSObject::fakeNativeFixedData(size_t nslots) const
 {
     return static_cast<const js::NativeObject*>(this)->fixedData(nslots);
 }
 
-#endif /* vm_ObjectImpl_inl_h */
+#endif /* vm_NativeObject_inl_h */

rename from js/src/vm/ObjectImpl.cpp
rename to js/src/vm/NativeObject.cpp
--- a/js/src/vm/ObjectImpl.cpp
+++ b/js/src/vm/NativeObject.cpp
@@ -1,15 +1,15 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "vm/ObjectImpl-inl.h"
+#include "vm/NativeObject-inl.h"
 
 #include "mozilla/CheckedInt.h"
 
 #include "jswatchpoint.h"
 
 #include "gc/Marking.h"
 #include "js/Value.h"
 #include "vm/Debugger.h"

rename from js/src/vm/ObjectImpl.h
rename to js/src/vm/NativeObject.h
--- a/js/src/vm/ObjectImpl.h
+++ b/js/src/vm/NativeObject.h
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  * vim: set ts=8 sts=4 et sw=4 tw=99:
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef vm_ObjectImpl_h
-#define vm_ObjectImpl_h
+#ifndef vm_NativeObject_h
+#define vm_NativeObject_h
 
 #include "mozilla/Assertions.h"
 #include "mozilla/Attributes.h"
 
 #include <stdint.h>
 
 #include "jsfriendapi.h"
 #include "jsinfer.h"
@@ -1631,9 +1631,9 @@ namespace js {
 inline NativeObject *
 MaybeNativeObject(JSObject *obj)
 {
     return obj ? &obj->as<NativeObject>() : nullptr;
 }
 
 } // namespace js
 
-#endif /* vm_ObjectImpl_h */
+#endif /* vm_NativeObject_h */