diff --git a/src/Alexandrie-Harfbuzz-Tests/AeHbBufferTest.class.st b/src/Alexandrie-Harfbuzz-Tests/AeHbBufferTest.class.st
index 0796b66..d7a6c5d 100644
--- a/src/Alexandrie-Harfbuzz-Tests/AeHbBufferTest.class.st
+++ b/src/Alexandrie-Harfbuzz-Tests/AeHbBufferTest.class.st
@@ -151,6 +151,6 @@ AeHbBufferTest >> testSimpleExample [
 	#(75 52 55) withIndexDo: [ :each :index |
 		self assert: (infos at: index) codepoint equals: each ].
 	#(625 557 439) withIndexDo: [ :each :index |
-		self assert: (positions at: index) x_advance equals: each ].
+		self assert: (positions at: index) xAdvance equals: each ].
 
 ]
diff --git a/src/Alexandrie-Harfbuzz/AeHbGlyphInfo.class.st b/src/Alexandrie-Harfbuzz/AeHbGlyphInfo.class.st
index 5b26699..7815cb7 100644
--- a/src/Alexandrie-Harfbuzz/AeHbGlyphInfo.class.st
+++ b/src/Alexandrie-Harfbuzz/AeHbGlyphInfo.class.st
@@ -36,17 +36,10 @@ AeHbGlyphInfo class >> fieldsDesc [
 
 	^ #(
 		hb_codepoint_t codepoint
-		
-		"<private> hb_mask_t      mask;"
-		hb_mask_t mask
-
+		hb_mask_t mask           "(private)"
 		uint32_t       cluster
-
-		"/*< private >*/
-		  hb_var_int_t   var1;
-		  hb_var_int_t   var2;"
-		uint32 var1
-		uint32 var2
+		hb_var_int_t var1        "(private)"
+		hb_var_int_t var2        "(private)"
 		)
 ]
 
@@ -74,18 +67,6 @@ AeHbGlyphInfo >> codepoint: anObject [
 	handle unsignedLongAt: OFFSET_CODEPOINT put: anObject
 ]
 
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> mask [
-	"This method was automatically generated"
-	^handle unsignedLongAt: OFFSET_MASK
-]
-
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> mask: anObject [
-	"This method was automatically generated"
-	handle unsignedLongAt: OFFSET_MASK put: anObject
-]
-
 { #category : 'printing' }
 AeHbGlyphInfo >> printOn: aStream [
 
@@ -99,27 +80,3 @@ AeHbGlyphInfo >> printOn: aStream [
 		 ].
 
 ]
-
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> var1 [
-	"This method was automatically generated"
-	^handle unsignedLongAt: OFFSET_VAR1
-]
-
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> var1: anObject [
-	"This method was automatically generated"
-	handle unsignedLongAt: OFFSET_VAR1 put: anObject
-]
-
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> var2 [
-	"This method was automatically generated"
-	^handle unsignedLongAt: OFFSET_VAR2
-]
-
-{ #category : 'accessing - structure variables' }
-AeHbGlyphInfo >> var2: anObject [
-	"This method was automatically generated"
-	handle unsignedLongAt: OFFSET_VAR2 put: anObject
-]
diff --git a/src/Alexandrie-Harfbuzz/AeHbGlyphPosition.class.st b/src/Alexandrie-Harfbuzz/AeHbGlyphPosition.class.st
index 2ae1ffb..dc094e7 100644
--- a/src/Alexandrie-Harfbuzz/AeHbGlyphPosition.class.st
+++ b/src/Alexandrie-Harfbuzz/AeHbGlyphPosition.class.st
@@ -10,10 +10,10 @@ Class {
 	#superclass : 'FFIExternalStructure',
 	#classVars : [
 		'OFFSET_VAR',
-		'OFFSET_X_ADVANCE',
-		'OFFSET_X_OFFSET',
-		'OFFSET_Y_ADVANCE',
-		'OFFSET_Y_OFFSET'
+		'OFFSET_XADVANCE',
+		'OFFSET_XOFFSET',
+		'OFFSET_YADVANCE',
+		'OFFSET_YOFFSET'
 	],
 	#pools : [
 		'AeHbTypes'
@@ -30,11 +30,11 @@ AeHbGlyphPosition class >> fieldsDesc [
 	"
 
 	^ #(
-		hb_position_t  x_advance
-		hb_position_t  y_advance
-		hb_position_t  x_offset
-		hb_position_t  y_offset
-		uint32 var "<private> hb_var_int_t   var;"
+		hb_position_t  xAdvance "x_advance"
+		hb_position_t  yAdvance "y_advance"
+		hb_position_t  xOffset  "x_offset"
+		hb_position_t  yOffset  "y_offset"
+		hb_var_int_t var        "(private)"
 		)
 ]
 
@@ -42,7 +42,7 @@ AeHbGlyphPosition class >> fieldsDesc [
 AeHbGlyphPosition >> printOn: aStream [
 
 	super printOn: aStream.
-	#(x_advance y_advance x_offset y_offset) do: [ :each |
+	#(xAdvance yAdvance xOffset yOffset) do: [ :each |
 		aStream
 			space;
 			nextPutAll: each;
@@ -53,85 +53,73 @@ AeHbGlyphPosition >> printOn: aStream [
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> var [
+AeHbGlyphPosition >> xAdvance [
 	"This method was automatically generated"
-	^handle unsignedLongAt: OFFSET_VAR
+	^handle signedLongAt: OFFSET_XADVANCE
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> var: anObject [
+AeHbGlyphPosition >> xAdvance: anObject [
 	"This method was automatically generated"
-	handle unsignedLongAt: OFFSET_VAR put: anObject
+	handle signedLongAt: OFFSET_XADVANCE put: anObject
 ]
 
 { #category : 'accessing' }
 AeHbGlyphPosition >> xAdvanceFrom26Dot6 [
 
-	^ self x_advance from26Dot6FractionalPoint
-]
-
-{ #category : 'accessing' }
-AeHbGlyphPosition >> xOffsetFrom26Dot6 [
-
-	^ self x_offset from26Dot6FractionalPoint
+	^ self xAdvance from26Dot6FractionalPoint
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> x_advance [
+AeHbGlyphPosition >> xOffset [
 	"This method was automatically generated"
-	^handle signedLongAt: OFFSET_X_ADVANCE
+	^handle signedLongAt: OFFSET_XOFFSET
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> x_advance: anObject [
+AeHbGlyphPosition >> xOffset: anObject [
 	"This method was automatically generated"
-	handle signedLongAt: OFFSET_X_ADVANCE put: anObject
+	handle signedLongAt: OFFSET_XOFFSET put: anObject
+]
+
+{ #category : 'accessing' }
+AeHbGlyphPosition >> xOffsetFrom26Dot6 [
+
+	^ self xOffset from26Dot6FractionalPoint
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> x_offset [
+AeHbGlyphPosition >> yAdvance [
 	"This method was automatically generated"
-	^handle signedLongAt: OFFSET_X_OFFSET
+	^handle signedLongAt: OFFSET_YADVANCE
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> x_offset: anObject [
+AeHbGlyphPosition >> yAdvance: anObject [
 	"This method was automatically generated"
-	handle signedLongAt: OFFSET_X_OFFSET put: anObject
+	handle signedLongAt: OFFSET_YADVANCE put: anObject
 ]
 
 { #category : 'accessing' }
 AeHbGlyphPosition >> yAdvanceFrom26Dot6 [
 
-	^ self y_advance from26Dot6FractionalPoint
-]
-
-{ #category : 'accessing' }
-AeHbGlyphPosition >> yOffsetFrom26Dot6 [
-
-	^ self y_offset from26Dot6FractionalPoint
+	^ self yAdvance from26Dot6FractionalPoint
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> y_advance [
+AeHbGlyphPosition >> yOffset [
 	"This method was automatically generated"
-	^handle signedLongAt: OFFSET_Y_ADVANCE
+	^handle signedLongAt: OFFSET_YOFFSET
 ]
 
 { #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> y_advance: anObject [
+AeHbGlyphPosition >> yOffset: anObject [
 	"This method was automatically generated"
-	handle signedLongAt: OFFSET_Y_ADVANCE put: anObject
+	handle signedLongAt: OFFSET_YOFFSET put: anObject
 ]
 
-{ #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> y_offset [
-	"This method was automatically generated"
-	^handle signedLongAt: OFFSET_Y_OFFSET
-]
+{ #category : 'accessing' }
+AeHbGlyphPosition >> yOffsetFrom26Dot6 [
 
-{ #category : 'accessing - structure variables' }
-AeHbGlyphPosition >> y_offset: anObject [
-	"This method was automatically generated"
-	handle signedLongAt: OFFSET_Y_OFFSET put: anObject
+	^ self yOffset from26Dot6FractionalPoint
 ]