Fix some more deprecations.

src/CodeExport/ProtocolOrganizer.extension.st

@@ -2,11 +2,19 @@ Extension { #name : #ProtocolOrganizer }
 
 { #category : #'*CodeExport' }
 ProtocolOrganizer >> stringForFileOut [
-
-	^ String streamContents: [:aStream | 
-			self protocols do: [:p | 
-				aStream << $( << p name printString.
-				p methods do: [:m |
-					aStream << ' ' << m asString ].
-				aStream << $); cr ]]
+	^ String
+		streamContents: [ :aStream | 
+			self protocols
+				do: [ :p | 
+					aStream
+						nextPut: $(;
+						nextPutAll: p name printString.
+					p methodSelectors
+						do: [ :m | 
+							aStream
+								space;
+								nextPutAll: m ].
+					aStream
+						nextPut: $);
+						cr ] ]
 ]

src/Deprecated80/Protocol.extension.st

@@ -18,6 +18,14 @@ Protocol >> methods: aCollection [
 	^ self methodSelectors: aCollection
 ]
 
+{ #category : #'*Deprecated80' }
+Protocol class >> name: nm methods: methods [
+	self
+		deprecated: 'Use #name:methodSelectors: instead'
+		transformWith: '`@receiver name: `@arg1 methods: `@arg2' -> '`@receiver name: `@arg1 methodSelectors: `@arg2'.
+	^ self name: nm methods: methods
+]
+
 { #category : #'*Deprecated80' }
 Protocol >> removeAllMethods [
 	self deprecated: 'Use #removeAllMethodSelectors instead' transformWith: '`@receiver removeAllMethods' -> '`@receiver removeAllMethodSelectors'.

src/Kernel/ClassOrganization.class.st

@@ -368,7 +368,7 @@ ClassOrganization >> renameCategory: oldName toBe: newName [
 
 	self notifyOfChangedCategoryFrom: oldName to: newName.
 	"I need to notify also the selector changes, otherwise RPackage will not notice"
-	(self protocolOrganizer protocolNamed: newName) methods 
+	(self protocolOrganizer protocolNamed: newName) methodSelectors 
 		do: [ :each | self notifyOfChangedSelector: each from: oldName to: newName ]
 ]
 

src/Kernel/Protocol.class.st

@@ -37,10 +37,9 @@ Protocol class >> name: nm [
 ]
 
 { #category : #'instance creation' }
-Protocol class >> name: nm methods: methods [ 
-
+Protocol class >> name: nm methodSelectors: methods [
 	^ self new
-		methods: methods;
+		methodSelectors: methods;
 		name: nm asSymbol;
 		yourself
 ]

src/Kernel/ProtocolOrganizer.class.st

@@ -81,13 +81,12 @@ ProtocolOrganizer >> extensionProtocols [
 
 { #category : #importing }
 ProtocolOrganizer >> fromSpec: aSpec [
-
-	aSpec do: [:spec || name methods |
-		name := spec first asSymbol.
-		methods := spec allButFirst asSet.
-		self addProtocol: (Protocol 
-								name: name
-								methods: methods) ]
+	aSpec
+		do: [ :spec | 
+			| name methods |
+			name := spec first asSymbol.
+			methods := spec allButFirst asSet.
+			self addProtocol: (Protocol name: name methodSelectors: methods) ]
 ]
 
 { #category : #protocol }