diff --git a/contrib/intagg/Makefile b/contrib/intagg/Makefile
index 372c0919a7..2cfe9978e2 100644
--- a/contrib/intagg/Makefile
+++ b/contrib/intagg/Makefile
@@ -1,7 +1,7 @@
 # contrib/intagg/Makefile
 
-EXTENSION = int_aggregate
-DATA = int_aggregate--1.0.sql int_aggregate--unpackaged--1.0.sql
+EXTENSION = intagg
+DATA = intagg--1.0.sql intagg--unpackaged--1.0.sql
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/contrib/intagg/int_aggregate--unpackaged--1.0.sql b/contrib/intagg/int_aggregate--unpackaged--1.0.sql
deleted file mode 100644
index 0bc874e645..0000000000
--- a/contrib/intagg/int_aggregate--unpackaged--1.0.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-/* contrib/intagg/int_aggregate--unpackaged--1.0.sql */
-
-ALTER EXTENSION int_aggregate ADD function int_agg_state(internal,integer);
-ALTER EXTENSION int_aggregate ADD function int_agg_final_array(internal);
-ALTER EXTENSION int_aggregate ADD function int_array_aggregate(integer);
-ALTER EXTENSION int_aggregate ADD function int_array_enum(integer[]);
diff --git a/contrib/intagg/int_aggregate--1.0.sql b/contrib/intagg/intagg--1.0.sql
similarity index 95%
rename from contrib/intagg/int_aggregate--1.0.sql
rename to contrib/intagg/intagg--1.0.sql
index ce78d17b77..19a57c079b 100644
--- a/contrib/intagg/int_aggregate--1.0.sql
+++ b/contrib/intagg/intagg--1.0.sql
@@ -1,4 +1,4 @@
-/* contrib/intagg/int_aggregate--1.0.sql */
+/* contrib/intagg/intagg--1.0.sql */
 
 -- Internal function for the aggregate
 -- Is called for each item in an aggregation
diff --git a/contrib/intagg/intagg--unpackaged--1.0.sql b/contrib/intagg/intagg--unpackaged--1.0.sql
new file mode 100644
index 0000000000..95238d9c67
--- /dev/null
+++ b/contrib/intagg/intagg--unpackaged--1.0.sql
@@ -0,0 +1,6 @@
+/* contrib/intagg/intagg--unpackaged--1.0.sql */
+
+ALTER EXTENSION intagg ADD function int_agg_state(internal,integer);
+ALTER EXTENSION intagg ADD function int_agg_final_array(internal);
+ALTER EXTENSION intagg ADD function int_array_aggregate(integer);
+ALTER EXTENSION intagg ADD function int_array_enum(integer[]);
diff --git a/contrib/intagg/int_aggregate.control b/contrib/intagg/intagg.control
similarity index 79%
rename from contrib/intagg/int_aggregate.control
rename to contrib/intagg/intagg.control
index f8e47d5a7f..f11fb11940 100644
--- a/contrib/intagg/int_aggregate.control
+++ b/contrib/intagg/intagg.control
@@ -1,4 +1,4 @@
-# int_aggregate extension
+# intagg extension
 comment = 'integer aggregator and enumerator (obsolete)'
 default_version = '1.0'
 relocatable = true