diff --git a/src/Famix-Java-Entities/FamixJavaClass.class.st b/src/Famix-Java-Entities/FamixJavaClass.class.st
index 5e51b798..ad127d7d 100644
--- a/src/Famix-Java-Entities/FamixJavaClass.class.st
+++ b/src/Famix-Java-Entities/FamixJavaClass.class.st
@@ -173,15 +173,14 @@ FamixJavaClass >> methodsWithoutSutbsAndConstructors [
 		each isStub not and: [each isConstructor not]]) asSet
 ]
 
-{ #category : #'as yet unclassified' }
+{ #category : #printing }
 FamixJavaClass >> mooseNameOn: aStream [
 
 	self typeContainer ifNotNil: [ :parent |
-		| separator |
 		parent mooseNameOn: aStream.
-		separator := '::'.
-		self isInnerClass ifTrue: [ separator := '$' ].
-		aStream nextPutAll: separator ].
+		self isInnerClass
+			ifTrue: [ aStream nextPut: $$ ]
+			ifFalse: [ aStream nextPutAll: '::' ] ].
 	self name ifNotNil: [ :n | aStream nextPutAll: n ]
 ]
 
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
index 9252f328..bf29be0c 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStImplicitVariable.class.st
@@ -56,7 +56,7 @@ FamixStImplicitVariable >> isSuper [
 	^ self name == #super
 ]
 
-{ #category : #testing }
+{ #category : #printing }
 FamixStImplicitVariable >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
index 4ea4f7d9..b92dc154 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStLocalVariable.class.st
@@ -46,7 +46,7 @@ FamixStLocalVariable class >> annotation [
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixStLocalVariable >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
index d68d4f83..4ddfc32d 100644
--- a/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
+++ b/src/Famix-PharoSmalltalk-Entities/FamixStParameter.class.st
@@ -46,7 +46,7 @@ FamixStParameter class >> annotation [
 	^ self
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixStParameter >> mooseNameOn: stream [ 
 	| parent |
 	parent := self parentBehaviouralEntity.
diff --git a/src/Famix-Traits/FamixTEnumValue.trait.st b/src/Famix-Traits/FamixTEnumValue.trait.st
index 16a10d3f..052f21f1 100644
--- a/src/Famix-Traits/FamixTEnumValue.trait.st
+++ b/src/Famix-Traits/FamixTEnumValue.trait.st
@@ -66,7 +66,7 @@ FamixTEnumValue >> isEnumValue [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixTEnumValue >> mooseNameOn: aStream [
 	(self belongsTo isNotNil and: [ self belongsTo name isNotNil ])
 		ifTrue: [ self belongsTo mooseNameOn: aStream.
diff --git a/src/Famix-Traits/FamixTType.trait.st b/src/Famix-Traits/FamixTType.trait.st
index b92f7780..c6a54443 100644
--- a/src/Famix-Traits/FamixTType.trait.st
+++ b/src/Famix-Traits/FamixTType.trait.st
@@ -84,7 +84,7 @@ FamixTType >> isType [
 	^ true
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 FamixTType >> mooseNameOn: aStream [
 	self typeContainer
 		ifNotNil: [ :parent |
diff --git a/src/Moose-Core/MooseGroup.class.st b/src/Moose-Core/MooseGroup.class.st
index 2ab0e96b..103a3ca8 100644
--- a/src/Moose-Core/MooseGroup.class.st
+++ b/src/Moose-Core/MooseGroup.class.st
@@ -127,7 +127,7 @@ MooseGroup >> mooseDescription [
 		ifNotNil: [ :model | model mooseDescriptionFor: self class ]
 ]
 
-{ #category : #accessing }
+{ #category : #printing }
 MooseGroup >> mooseNameOn: aStream [
 	"Hook to customize the rendered text of an entity. Do not specialize mooseName, but change/specialize this method if necessary."
 	aStream