diff --git a/source/GM-TE/GMTEEditor.class.st b/source/GM-TE/GMTEEditor.class.st
index f7fa2528..3cb0e052 100644
--- a/source/GM-TE/GMTEEditor.class.st
+++ b/source/GM-TE/GMTEEditor.class.st
@@ -146,7 +146,7 @@ GMTEEditor class >> tileMapMinPaddingSize [
 ]
 
 {
-	#category : #'menu button functions',
+	#category : #'layer button functions',
 	#'squeak_changestamp' : 'TW 6/23/2024 21:37'
 }
 GMTEEditor >> addLayer [
diff --git a/source/GM-Test.package/GMTileEditorTest.class/instance/setup..2.st b/source/GM-Test.package/GMTileEditorTest.class/instance/setup..2.st
index d9cb68e6..0119fa67 100644
--- a/source/GM-Test.package/GMTileEditorTest.class/instance/setup..2.st
+++ b/source/GM-Test.package/GMTileEditorTest.class/instance/setup..2.st
@@ -1,3 +1,3 @@
 as yet unclassified
 setup
-	self editor: GMTEEditor new
\ No newline at end of file
+	self editor: GMTEEditor new.
\ No newline at end of file
diff --git a/source/GM-Test.package/GMTileEditorTest.class/instance/testAddLayerButton.st b/source/GM-Test.package/GMTileEditorTest.class/instance/testAddLayerButton.st
index a51c4e58..eafd3d61 100644
--- a/source/GM-Test.package/GMTileEditorTest.class/instance/testAddLayerButton.st
+++ b/source/GM-Test.package/GMTileEditorTest.class/instance/testAddLayerButton.st
@@ -4,5 +4,5 @@ testAddLayerButton
 	
 	self assert: editor layerCount = 1.
 	self assert: (editor selectedLayers includes: 1).
-	self clickButton: (editor layerViewer submorphNamed: 'addLayer').
+	self editor addLayer.
 	self assert: editor layerCount = 2
\ No newline at end of file
diff --git a/source/GM-Test.package/GMTileEditorTest.class/instance/testRenameLayer.st b/source/GM-Test.package/GMTileEditorTest.class/instance/testRenameLayer.st
index 11f87de3..727bd561 100644
--- a/source/GM-Test.package/GMTileEditorTest.class/instance/testRenameLayer.st
+++ b/source/GM-Test.package/GMTileEditorTest.class/instance/testRenameLayer.st
@@ -2,5 +2,5 @@ as yet unclassified
 testRenameLayer
 	"tests the renaming of layers"
 	
-	self editor updateLayerNameOf: self editor getSelectedLayer to: 'testName'.
-	self assert: ((self editor getLayerList at: 1) literalEqual: 'testName (v)')
\ No newline at end of file
+	self editor tileMap tileMatrixStack setLayerNameOf: self editor getSelectedLayer to: 'testName'.
+	self assert: ((self editor tileMap tileMatrixStack layerNameOf: 1) literalEqual: 'testName')
\ No newline at end of file
diff --git a/source/GM-Test.package/GMTileEditorTest.class/methodProperties.json b/source/GM-Test.package/GMTileEditorTest.class/methodProperties.json
index cef29911..3fedb5f3 100644
--- a/source/GM-Test.package/GMTileEditorTest.class/methodProperties.json
+++ b/source/GM-Test.package/GMTileEditorTest.class/methodProperties.json
@@ -11,7 +11,7 @@
 		"setUp" : "jj 6/23/2024 18:55",
 		"setup" : "TW 6/23/2024 20:38",
 		"tearDown" : "jj 6/22/2024 20:24",
-		"testAddLayerButton" : "TW 6/23/2024 20:08",
+		"testAddLayerButton" : "JS 6/24/2024 00:19",
 		"testDeleteLayer" : "jj 6/22/2024 20:25",
 		"testDirectImport" : "jj 6/22/2024 20:30",
 		"testDirectImportFromAssetbrowser" : "jj 6/22/2024 20:30",
@@ -22,7 +22,7 @@
 		"testMoveLayerUp" : "jj 6/22/2024 20:31",
 		"testMultiDeleteLayer" : "jj 6/22/2024 20:31",
 		"testMultiToggleLayerVisibility" : "jj 6/22/2024 20:34",
-		"testRenameLayer" : "jj 6/22/2024 20:32",
+		"testRenameLayer" : "JS 6/24/2024 00:15",
 		"testRescaleMap" : "jj 6/22/2024 20:32",
 		"testSwapLayer" : "jj 6/22/2024 20:33",
 		"testToggleLayerVisibility" : "jj 6/22/2024 20:34",
diff --git a/testMapFile.morph b/testMapFile.morph
index 6f23270f..9997ee99 100644
Binary files a/testMapFile.morph and b/testMapFile.morph differ