@@ -24,11 +24,11 @@
 #include <stdarg.h>
 #include <inttypes.h>
 
 #import "OFObject.h"
 #import "OFSerialization.h"
-#import "OFJSONEncoding.h"
+#import "OFJSONRepresentation.h"
 
 #import "macros.h"
 
 @class OFConstantString;
 
@@ -78,11 +78,11 @@
  * for a constant string and get initialized on the first message! Therefore,
  * you should use the corresponding methods to get the ivars, which ensures the
  * constant string is initialized.
  */
 @interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing,
-    OFSerialization, OFJSON>
+    OFSerialization, OFJSONRepresentation>
 #ifdef OF_HAVE_PROPERTIES
 @property (readonly) size_t length;
 #endif
 
 /**