Index: src/SL3PreparedStatement.m
==================================================================
--- src/SL3PreparedStatement.m
+++ src/SL3PreparedStatement.m
@@ -193,11 +193,11 @@
 		    dataWithItems: sqlite3_column_blob(_stmt, column)
 			    count: sqlite3_column_bytes(_stmt, column)];
 	case SQLITE_NULL:
 		return [OFNull null];
 	default:
-		OF_ENSURE(0);
+		OFEnsure(0);
 	}
 }
 
 - (size_t)columnCount
 {

Index: tests/Tests.m
==================================================================
--- tests/Tests.m
+++ tests/Tests.m
@@ -68,14 +68,14 @@
 	for (size_t i = 0; [stmt step]; i++) {
 		OFNumber *a;
 		OFString *b;
 		OFData *c;
 
-		OF_ENSURE([stmt columnCount] == 3);
-		OF_ENSURE([[stmt nameForColumn: 0] isEqual: @"a"]);
-		OF_ENSURE([[stmt nameForColumn: 1] isEqual: @"b"]);
-		OF_ENSURE([[stmt nameForColumn: 2] isEqual: @"c"]);
+		OFEnsure([stmt columnCount] == 3);
+		OFEnsure([[stmt nameForColumn: 0] isEqual: @"a"]);
+		OFEnsure([[stmt nameForColumn: 1] isEqual: @"b"]);
+		OFEnsure([[stmt nameForColumn: 2] isEqual: @"c"]);
 
 		switch (i) {
 		case 0:
 			a = [OFNumber numberWithInt: 5];
 			b = @"String";
@@ -87,22 +87,22 @@
 			b = @"Test";
 			c = [OFData dataWithItems: "xyz"
 					    count: 3];
 			break;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 
-		OF_ENSURE([[stmt objectForColumn: 0] isEqual: a]);
-		OF_ENSURE([[stmt objectForColumn: 1] isEqual: b]);
-		OF_ENSURE([[stmt objectForColumn: 2] isEqual: c]);
+		OFEnsure([[stmt objectForColumn: 0] isEqual: a]);
+		OFEnsure([[stmt objectForColumn: 1] isEqual: b]);
+		OFEnsure([[stmt objectForColumn: 2] isEqual: c]);
 
-		OF_ENSURE([[stmt rowArray] isEqual: ([OFArray arrayWithObjects:
+		OFEnsure([[stmt rowArray] isEqual: ([OFArray arrayWithObjects:
 		    a, b, c, nil])]);
-		OF_ENSURE([[stmt rowDictionary] isEqual:
+		OFEnsure([[stmt rowDictionary] isEqual:
 		    ([OFDictionary dictionaryWithKeysAndObjects:
 		    @"a", a, @"b", b, @"c", c, nil])]);
 	}
 
 	[OFApplication terminate];
 }
 @end