diff --git a/.gitignore b/.gitignore
index abec3c7..cacdd7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@
 
 /src/pmc/Makefile
 /src/pmc/php*.c
+/src/pmc/pipp_group.c
+/src/pmc/pipp_group.h
 /src/pmc/php*.h
 /src/pmc/pmc_php*.h
 /src/pmc/*.bundle
diff --git a/build/templates/src/pmc/Makefile.in b/build/templates/src/pmc/Makefile.in
index 88cc13d..3077292 100644
--- a/build/templates/src/pmc/Makefile.in
+++ b/build/templates/src/pmc/Makefile.in
@@ -23,7 +23,7 @@ HASH_SOURCES = pipp_hash.c
 HASH_H       = pipp_hash.h
 HASH_OBJS    = pipp_hash$(O)
 
-PHP_GROUP    = $(PMC_DIR)/php_group$(LOAD_EXT)
+PIPP_GROUP    = $(PMC_DIR)/pipp_group$(LOAD_EXT)
 
 PMC_SOURCES  = \
   php.pmc \
@@ -57,7 +57,7 @@ PMC_SOURCES = \
 
 
 # default
-build: $(HASH_OBJS) $(PHP_GROUP)
+build: $(HASH_OBJS) $(PIPP_GROUP)
 
 
 # This is a listing of all targets, that are meant to be called by users
@@ -82,7 +82,7 @@ $(HASH_OBJS): $(HASH_SOURCES) $(HASH_H)
 export DYNPMC_INCLUDE=$(BUILD_DIR)/languages/pipp
 export DYNPMC_LINK=$(BUILD_DIR)/languages/pipp/src/pmc/$(HASH_OBJS)
 
-$(PHP_GROUP): $(PMC_SOURCES)
+$(PIPP_GROUP): $(PMC_SOURCES)
 	@$(PMCBUILD) generate $(PMCS)
 	@$(PMCBUILD) compile $(PMCS)
 	@$(PMCBUILD) linklibs $(PMCS)
@@ -90,5 +90,5 @@ $(PHP_GROUP): $(PMC_SOURCES)
 
 # cleaning up
 clean:
-	$(RM_F) "*dump" "php*.c" "pmc_*h" "php_group.h" "*$(O)" "*$(LOAD_EXT)"
+	$(RM_F) "*dump" "php*.c" "pmc_*h" "pipp_group.h" "*$(O)" "*$(LOAD_EXT)"
 
diff --git a/src/common/builtins.pir b/src/common/builtins.pir
index e36600a..5e70edb 100644
--- a/src/common/builtins.pir
+++ b/src/common/builtins.pir
@@ -1,7 +1,7 @@
 
 .HLL 'pipp'
 
-.loadlib 'php_group'
+.loadlib 'pipp_group'
 
 .include 'languages/pipp/src/common/php_MACRO.pir'
 .include 'languages/pipp/src/common/guts.pir'
diff --git a/src/pmc/php.pmc b/src/pmc/php.pmc
index 31149e1..e7e04cb 100644
--- a/src/pmc/php.pmc
+++ b/src/pmc/php.pmc
@@ -32,7 +32,7 @@ static PMC * Php_PMC;
 pmclass Php
     singleton
     dynpmc
-    group php_group {
+    group pipp_group {
 
 /*
 * Class initialization.
diff --git a/src/pmc/phparray.pmc b/src/pmc/phparray.pmc
index dafbabc..ccc61ae 100644
--- a/src/pmc/phparray.pmc
+++ b/src/pmc/phparray.pmc
@@ -24,7 +24,7 @@ pmclass PhpArray
     dynpmc
     need_ext
     hll      PHP
-    group    php_group
+    group    pipp_group
     provides array
     provides hash
     maps     Array
diff --git a/src/pmc/phpboolean.pmc b/src/pmc/phpboolean.pmc
index 6f9fe9b..6fdf1de 100644
--- a/src/pmc/phpboolean.pmc
+++ b/src/pmc/phpboolean.pmc
@@ -23,7 +23,7 @@ pmclass PhpBoolean
     provides boolean
     provides integer
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP
     maps     Boolean {
 
diff --git a/src/pmc/phpfloat.pmc b/src/pmc/phpfloat.pmc
index 65c9c05..b48915c 100644
--- a/src/pmc/phpfloat.pmc
+++ b/src/pmc/phpfloat.pmc
@@ -22,7 +22,7 @@ pmclass PhpFloat
     provides scalar
     provides float
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP
     maps     Float {
 
diff --git a/src/pmc/phpinteger.pmc b/src/pmc/phpinteger.pmc
index 699ed99..0fdc63f 100644
--- a/src/pmc/phpinteger.pmc
+++ b/src/pmc/phpinteger.pmc
@@ -20,7 +20,7 @@ pmclass PhpInteger
     provides scalar
     provides integer
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP
     maps     Integer {
 
diff --git a/src/pmc/phpnull.pmc b/src/pmc/phpnull.pmc
index 6820864..c1e29db 100644
--- a/src/pmc/phpnull.pmc
+++ b/src/pmc/phpnull.pmc
@@ -20,7 +20,7 @@ src/pmc/phpnull.pmc - PHP Null
 pmclass PhpNull
     extends  Undef
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP {
 
 /*
diff --git a/src/pmc/phpresource.pmc b/src/pmc/phpresource.pmc
index 364c113..958aee4 100644
--- a/src/pmc/phpresource.pmc
+++ b/src/pmc/phpresource.pmc
@@ -20,7 +20,7 @@ src/pmc/phpresource.pmc - PHP Resource
 pmclass PhpResource
     provides ref
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP {
 
 /*
diff --git a/src/pmc/phpstring.pmc b/src/pmc/phpstring.pmc
index 4af7eeb..5958fc0 100644
--- a/src/pmc/phpstring.pmc
+++ b/src/pmc/phpstring.pmc
@@ -22,7 +22,7 @@ pmclass PhpString
     provides scalar
     provides string
     dynpmc
-    group    php_group
+    group    pipp_group
     hll      PHP
     maps     String {
 
diff --git a/t/pmc/array.t b/t/pmc/array.t
index 3edc4b1..c2df4cf 100644
--- a/t/pmc/array.t
+++ b/t/pmc/array.t
@@ -15,7 +15,7 @@ Tests the PhpArray PMC.
 
 =cut
 
-.loadlib 'php_group'
+.loadlib 'pipp_group'
 
 .sub main :main
     .include 'include/test_more.pir'
diff --git a/t/pmc/boolean.t b/t/pmc/boolean.t
index 87ddd2a..a52ac98 100644
--- a/t/pmc/boolean.t
+++ b/t/pmc/boolean.t
@@ -15,7 +15,7 @@ Tests C<PhpBoolean> PMC.
 
 =cut
 
-.loadlib "php_group"
+.loadlib "pipp_group"
 
 .sub 'main' :main
     .include "include/test_more.pir"
diff --git a/t/pmc/null.t b/t/pmc/null.t
index f52eb88..d269263 100644
--- a/t/pmc/null.t
+++ b/t/pmc/null.t
@@ -15,7 +15,7 @@ Tests C<PhpNull> PMC.
 
 =cut
 
-.loadlib "php_group"
+.loadlib "pipp_group"
 
 .sub 'main' :main
     .include "include/test_more.pir"