diff --git a/layout/base/FrameProperties.h b/layout/base/FrameProperties.h
index 71a79138a3..74513abacb 100644
--- a/layout/base/FrameProperties.h
+++ b/layout/base/FrameProperties.h
@@ -62,7 +62,7 @@ protected:
  *
  * To use this class, declare a global (i.e., file, class or function-scope
  * static member) FramePropertyDescriptor and pass its address as
- * aProperty in the FramePropertyTable methods.
+ * aProperty in the FrameProperties methods.
  */
 template<typename T>
 struct FramePropertyDescriptor : public FramePropertyDescriptorUntyped
diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h
index 37a4e3749b..ec35684832 100644
--- a/layout/generic/nsIFrame.h
+++ b/layout/generic/nsIFrame.h
@@ -997,7 +997,7 @@ public:
 #define NS_DECLARE_FRAME_PROPERTY_WITH_DTOR_NEVER_CALLED(prop, type)  \
   static void AssertOnDestroyingProperty##prop(type*) {               \
     MOZ_ASSERT_UNREACHABLE("Frame property " #prop " should never "   \
-                           "be destroyed by the FramePropertyTable"); \
+                           "be destroyed by the FrameProperties class"); \
   }                                                                   \
   NS_DECLARE_FRAME_PROPERTY_WITH_DTOR(prop, type,                     \
                                       AssertOnDestroyingProperty##prop)