Index: src/OFMutableString_UTF8.m
==================================================================
--- src/OFMutableString_UTF8.m
+++ src/OFMutableString_UTF8.m
@@ -327,19 +327,19 @@
 
 	s->cString[s->cStringLength] = 0;
 }
 
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding
+	     encoding: (of_string_encoding_t)encoding
 {
 	return [self appendCString: cString
-		      withEncoding: encoding
+			  encoding: encoding
 			    length: strlen(cString)];
 }
 
 - (void)appendCString: (const char*)cString
-	 withEncoding: (of_string_encoding_t)encoding
+	     encoding: (of_string_encoding_t)encoding
 	       length: (size_t)cStringLength
 {
 	if (encoding == OF_STRING_ENCODING_UTF_8)
 		[self appendUTF8String: cString
 			    withLength: cStringLength];

Index: src/of_asprintf.m
==================================================================
--- src/of_asprintf.m
+++ src/of_asprintf.m
@@ -239,18 +239,18 @@
 		ctx->length_modifier = LENGTH_MODIFIER_CAPITAL_L;
 
 		break;
 #ifdef _WIN32
 	case 'I': /* win32 strangeness (I64 instead of ll or j) */
-		if (ctx->formatLen > ctx->i + 2 &&
+		if (ctx->format_len > ctx->i + 2 &&
 		    ctx->format[ctx->i + 1] == '6' &&
 		    ctx->format[ctx->i + 2] == '4') {
 			if (!append_subformat(ctx, ctx->format + ctx->i, 3))
 				return false;
 
 			ctx->i += 2;
-			ctx->lengthModifier = LENGTH_MODIFIER_LL;
+			ctx->length_modifier = LENGTH_MODIFIER_LL;
 		} else
 			ctx->i--;
 
 		break;
 #endif
@@ -257,11 +257,11 @@
 #ifdef OF_IOS
 	case 'q': /* iOS uses this for PRI?64 */
 		if (!append_subformat(ctx, ctx->format + ctx->i, 1))
 			return false;
 
-		ctx->lengthModifier = LENGTH_MODIFIER_LL;
+		ctx->length_modifier = LENGTH_MODIFIER_LL;
 
 		break;
 #endif
 	default:
 		ctx->i--;