diff --git a/META.json b/META.json
index 2381ce8b..abc65695 100644
--- a/META.json
+++ b/META.json
@@ -1,5 +1,5 @@
 {
-    "name": "pg_partmaint",
+    "name": "pg_partman",
     "abstract": "Extension to manage partitioned tables by time or ID",
     "version": "0.1.0",
     "maintainer": [ 
@@ -18,19 +18,19 @@
     },
     "provides": {
         "pg_partmaint": {
-            "file": "sql/pg_partmaint.sql",
-            "docfile": "doc/partmaint.md",
+            "file": "sql/pg_partman.sql",
+            "docfile": "doc/partman.md",
             "version": "0.1.0",
             "abstract": "Extension to manage partitioned tables by time or ID"
         }
     },
     "resources": {
         "bugtracker": {
-            "web": "https://github.com/keithf4/pg_partmaint/issues"
+            "web": "https://github.com/keithf4/pg_partman/issues"
         },
         "repository": {
-            "url": "git://github.com/keithf4/pg_partmaint.git" ,
-            "web": "https://github.com/keithf4/pg_partmaint",
+            "url": "git://github.com/keithf4/pg_partman.git" ,
+            "web": "https://github.com/keithf4/pg_partman",
             "type": "git"
         }
     },    
@@ -41,6 +41,7 @@
     "tags": [
         "partition",
         "partitions",
+        "partitioning",
         "table",
         "tables"
     ]
diff --git a/Makefile b/Makefile
index 8d6972ad..7935aab8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-EXTENSION = pg_partmaint
+EXTENSION = pg_partman
 EXTVERSION = $(shell grep default_version $(EXTENSION).control | \
                sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
                
diff --git a/README.md b/README.md
index 215c38fa..bac4e653 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 LICENSE AND COPYRIGHT
 ---------------------
 
-pg_partmaint is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
+PG Partition Manager (pg_partman) is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.
 
 Copyright (c) 2012 OmniTI, Inc.
 
diff --git a/doc/pg_partmaint.md b/doc/pg_partman.md
similarity index 98%
rename from doc/pg_partmaint.md
rename to doc/pg_partman.md
index eff2eb99..9fc8706b 100644
--- a/doc/pg_partmaint.md
+++ b/doc/pg_partman.md
@@ -1,4 +1,4 @@
-PostgreSQL Partition Maintenance Extension (pg_partmaint)
+PostgreSQL Partition Manager Extension (pg_partman)
 --------------------------------------------------
 
 Extension to help make managing time or serial id based table partitioning easier. 
diff --git a/pg_partmaint.control b/pg_partman.control
similarity index 100%
rename from pg_partmaint.control
rename to pg_partman.control