diff --git a/Makefile b/Makefile
index acd93ea..e1926f9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ PKG_CONFIG = pkg-config
 
 extension_version = 0
 
-EXTENSION = pguri
-MODULE_big = pguri
-OBJS = pguri.o
-DATA_built = pguri--$(extension_version).sql
+EXTENSION = uri
+MODULE_big = uri
+OBJS = uri.o
+DATA_built = uri--$(extension_version).sql
 
 ifeq (no,$(shell $(PKG_CONFIG) liburiparser || echo no))
 $(warning liburiparser not registed with pkg-config, build might fail)
@@ -21,5 +21,5 @@ REGRESS_OPTS = --inputdir=test
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
-pguri--$(extension_version).sql: pguri.sql
+uri--$(extension_version).sql: uri.sql
 	cat $^ >$@
diff --git a/test/expected/init.out b/test/expected/init.out
index 3d54192..b222585 100644
--- a/test/expected/init.out
+++ b/test/expected/init.out
@@ -1 +1 @@
-CREATE EXTENSION pguri;
+CREATE EXTENSION uri;
diff --git a/test/sql/init.sql b/test/sql/init.sql
index 3d54192..b222585 100644
--- a/test/sql/init.sql
+++ b/test/sql/init.sql
@@ -1 +1 @@
-CREATE EXTENSION pguri;
+CREATE EXTENSION uri;
diff --git a/pguri.c b/uri.c
similarity index 100%
rename from pguri.c
rename to uri.c
diff --git a/pguri.control b/uri.control
similarity index 63%
rename from pguri.control
rename to uri.control
index ddf5a46..e07dc2a 100644
--- a/pguri.control
+++ b/uri.control
@@ -1,4 +1,4 @@
 comment = 'uri type'
 default_version = 0
-module_pathname = '$libdir/pguri'
+module_pathname = '$libdir/uri'
 relocatable = true
diff --git a/pguri.sql b/uri.sql
similarity index 88%
rename from pguri.sql
rename to uri.sql
index 0881131..75ac607 100644
--- a/pguri.sql
+++ b/uri.sql
@@ -7,13 +7,13 @@ CREATE FUNCTION uri_in(cstring) RETURNS uri
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_out(uri) RETURNS cstring
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE TYPE uri (
     INTERNALLENGTH = -1,
@@ -30,92 +30,92 @@ CREATE FUNCTION uri_scheme(uri) RETURNS text
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_userinfo(uri) RETURNS text
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_host(uri) RETURNS text
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_host_inet(uri) RETURNS inet
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_port(uri) RETURNS integer
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_query(uri) RETURNS text
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_fragment(uri) RETURNS text
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_path(uri) RETURNS text[]
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 
 CREATE FUNCTION uri_lt(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_le(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_eq(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_ne(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_ge(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_gt(uri, uri) RETURNS boolean
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE FUNCTION uri_cmp(uri, uri) RETURNS integer
     IMMUTABLE
     STRICT
     LANGUAGE C
-    AS '$libdir/pguri';
+    AS '$libdir/uri';
 
 CREATE OPERATOR < (
     LEFTARG = uri,