diff --git a/README.md b/README.md
index bc97cfc..7c72771 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,6 @@
+<<<<<<< Updated upstream
 # Smart Leaves
+=======
+# Cull Leaves
+>>>>>>> Stashed changes
 Adds culling to leaf blocks, providing a huge performance boost over vanilla.
diff --git a/gradle.properties b/gradle.properties
index 7beb57e..e46ff35 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx1G
 # Mod Properties
 	mod_version = 1.0.0
 	maven_group = eu.midnightdust
-	archives_base_name = fastleaves
+	archives_base_name = smartleaves
 
 # Dependencies
 	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
diff --git a/src/main/java/eu/midnightdust/fastleaves/mixin/MixinLeavesBlock.java b/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
similarity index 93%
rename from src/main/java/eu/midnightdust/fastleaves/mixin/MixinLeavesBlock.java
rename to src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
index 40f961c..e965d42 100644
--- a/src/main/java/eu/midnightdust/fastleaves/mixin/MixinLeavesBlock.java
+++ b/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java
@@ -1,4 +1,4 @@
-package eu.midnightdust.fastleaves.mixin;
+package eu.midnightdust.cullleaves.mixin;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
diff --git a/src/main/resources/assets/cullleaves/icon.png b/src/main/resources/assets/cullleaves/icon.png
new file mode 100644
index 0000000..8b0898f
Binary files /dev/null and b/src/main/resources/assets/cullleaves/icon.png differ
diff --git a/src/main/resources/assets/fastleaves/icon.png b/src/main/resources/assets/fastleaves/icon.png
deleted file mode 100644
index 6c193c2..0000000
Binary files a/src/main/resources/assets/fastleaves/icon.png and /dev/null differ
diff --git a/src/main/resources/fastleaves.mixins.json b/src/main/resources/cullleaves.mixins.json
similarity index 74%
rename from src/main/resources/fastleaves.mixins.json
rename to src/main/resources/cullleaves.mixins.json
index 9cec207..c504e12 100644
--- a/src/main/resources/fastleaves.mixins.json
+++ b/src/main/resources/cullleaves.mixins.json
@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "eu.midnightdust.fastleaves.mixin",
+  "package": "eu.midnightdust.cullleaves.mixin",
   "compatibilityLevel": "JAVA_8",
   "client": [
     "MixinLeavesBlock"
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 013d29e..fe47b99 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "id": "fastleaves",
+  "id": "cullleaves",
   "version": "${version}",
 
-  "name": "Fast Leaves",
+  "name": "Cull Leaves",
   "description": "Adds culling to leaf blocks, providing a huge performance boost over vanilla.",
   "authors": [
     "Motschen",
@@ -11,16 +11,16 @@
   ],
   "contact": {
     "homepage": "https://www.midnightdust.eu/",
-    "sources": "https://github.com/TeamMidnightDust/FastLeaves",
-    "issues": "https://github.com/TeamMidnightDust/FastLeaves/issues"
+    "sources": "https://github.com/TeamMidnightDust/CullLeaves",
+    "issues": "https://github.com/TeamMidnightDust/CullLeaves/issues"
   },
 
   "license": "MIT",
-  "icon": "assets/fastleaves/icon.png",
+  "icon": "assets/cullleaves/icon.png",
 
   "environment": "client",
 
   "mixins": [
-    "fastleaves.mixins.json"
+    "cullleaves.mixins.json"
   ]
 }