@@ -44,15 +44,15 @@
  * @brief A class similar to OFDictionary, but providing more options how keys
  *	  and values should be retained, released, compared and hashed.
  */
 @interface OFMapTable: OFObject <OFCopying, OFFastEnumeration>
 {
-	of_map_table_functions_t keyFunctions, valueFunctions;
-	struct of_map_table_bucket **buckets;
-	uint32_t minCapacity, capacity, count;
-	uint8_t rotate;
-	unsigned long mutations;
+	of_map_table_functions_t _keyFunctions, _valueFunctions;
+	struct of_map_table_bucket **_buckets;
+	uint32_t _minCapacity, _capacity, _count;
+	uint8_t _rotate;
+	unsigned long _mutations;
 }
 
 /*!
  * @brief Creates a new OFMapTable with the specified key and value functions.
  *
@@ -210,22 +210,22 @@
  * @brief A class which provides methods to enumerate through an OFMapTable's
  *	  keys or values.
  */
 @interface OFMapTableEnumerator: OFObject
 {
-	OFMapTable *mapTable;
-	struct of_map_table_bucket **buckets;
-	uint32_t capacity;
-	unsigned long mutations;
-	unsigned long *mutationsPtr;
-	uint32_t position;
+	OFMapTable *_mapTable;
+	struct of_map_table_bucket **_buckets;
+	uint32_t _capacity;
+	unsigned long _mutations;
+	unsigned long *_mutationsPtr;
+	uint32_t _position;
 }
 
-- OF_initWithMapTable: (OFMapTable*)mapTable_
-	      buckets: (struct of_map_table_bucket**)buckets_
-	     capacity: (uint32_t)capacity_
-     mutationsPointer: (unsigned long*)mutationsPtr_;
+- OF_initWithMapTable: (OFMapTable*)mapTable
+	      buckets: (struct of_map_table_bucket**)buckets
+	     capacity: (uint32_t)capacity
+     mutationsPointer: (unsigned long*)mutationsPtr;
 
 /*!
  * @brief Returns the next value.
  *
  * @return The next value
@@ -239,12 +239,12 @@
 - (void)reset;
 @end
 
 @interface OFMapTableEnumeratorWrapper: OFEnumerator
 {
-	OFMapTableEnumerator *enumerator;
-	id object;
+	OFMapTableEnumerator *_enumerator;
+	id _object;
 }
 
 - initWithEnumerator: (OFMapTableEnumerator*)enumerator
 	      object: (id)object;
 @end