@@ -11,11 +11,11 @@
 AC_PROG_EGREP
 
 CPP="$OBJCPP"
 CPPFLAGS="$CPPFLAGS $OBJCPPFLAGS"
 OBJCFLAGS="$OBJCFLAGS -Wall -fexceptions -fobjc-exceptions"
-OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstString"
+OBJCFLAGS="$OBJCFLAGS -fconstant-string-class=OFConstantString"
 
 AX_CHECK_COMPILER_FLAGS(-pipe, [OBJCFLAGS="$OBJCFLAGS -pipe"])
 AX_CHECK_COMPILER_FLAGS(-fno-common, [OBJCFLAGS="$OBJCFLAGS -fno-common"])
 AX_CHECK_COMPILER_FLAGS(-fno-constant-cfstrings, [
 	NO_CONST_CFSTRINGS="-fno-constant-cfstrings"
@@ -373,21 +373,21 @@
 
 	AC_MSG_CHECKING(whether gcc has bug objc/27438)
 	AC_TRY_COMPILE([
 		#import <objc/objc.h>
 
-		@interface OFConstString
+		@interface OFConstantString
 		{
 			Class isa;
 			const char *string;
 			unsigned long size;
 		}
 		@end
 
-		void *_OFConstStringClassReference;
+		void *_OFConstantStringClassReference;
 		], [
-		OFConstString *test = @"";
+		OFConstantString *test = @"";
 		test++; /* Get rid of unused variable warning */
 		], [AC_MSG_RESULT(no)], [
 		AC_MSG_RESULT([yes, adding -Wno-unused-variable])
 		OBJCFLAGS="$OBJCFLAGS -Wno-unused-variable"
 		AC_SUBST(NO_WARN_UNUSED, "-Wno-unused-variable")])