diff --git a/graphics.c b/graphics.c
index 0f6c0402e..21121839d 100644
--- a/graphics.c
+++ b/graphics.c
@@ -1192,7 +1192,7 @@ void draw_parts(pixel *vid)
                         blendpixel(vid, nx-1, ny+1, cr, cg, cb, 112);
                     }
                 }
-                else if(t==PT_OILL&&cmode == 6)
+                else if(t==PT_OIL&&cmode == 6)
                 {
                     for(x=-1; x<=1; x++)
                     {
@@ -1450,7 +1450,7 @@ void draw_parts(pixel *vid)
                     }
 
                 }
-                else if(t==PT_GASS&&cmode == 6)
+                else if(t==PT_GAS&&cmode == 6)
                 {
                     for(x=-1; x<=1; x++)
                     {
diff --git a/powder.c b/powder.c
index d6b71d927..ea07e0621 100644
--- a/powder.c
+++ b/powder.c
@@ -524,7 +524,7 @@ void update_particles_i(pixel *vid, int start, int inc)
             vy[y/CELL][x/CELL] *= ptypes[t].airloss;
             vx[y/CELL][x/CELL] += ptypes[t].airdrag*parts[i].vx;
             vy[y/CELL][x/CELL] += ptypes[t].airdrag*parts[i].vy;
-            if(t==PT_GASS||t==PT_NBLE)
+            if(t==PT_GAS||t==PT_NBLE)
             {
                 if(pv[y/CELL][x/CELL]<3.5f)
                     pv[y/CELL][x/CELL] += ptypes[t].hotair*(3.5f-pv[y/CELL][x/CELL]);
@@ -562,7 +562,7 @@ void update_particles_i(pixel *vid, int start, int inc)
             parts[i].vx *= ptypes[t].loss;
             parts[i].vy *= ptypes[t].loss;
 
-            if(t==PT_DFRM && !parts[i].life)
+            if(t==PT_GOO && !parts[i].life)
             {
                 if(pv[y/CELL][x/CELL]>1.0f)
                 {
@@ -650,17 +650,17 @@ void update_particles_i(pixel *vid, int start, int inc)
                 if(t==PT_WTRV && pv[y/CELL][x/CELL]>4.0f)
                     t = parts[i].type = PT_DSTW;
                 if(t==PT_DESL && pv[y/CELL][x/CELL]<-6.0f)
-                    t = parts[i].type = PT_GASS;
-                if(t==PT_GASS && pv[y/CELL][x/CELL]>6.0f)
+                    t = parts[i].type = PT_GAS;
+                if(t==PT_GAS && pv[y/CELL][x/CELL]>6.0f)
                     t = parts[i].type = PT_DESL;
                 if(t==PT_DESL && pv[y/CELL][x/CELL]>12.0f)
                     t = parts[i].type = PT_FIRE;
             }
             if(t==PT_DESL && pv[y/CELL][x/CELL]<-20.0f)
-                t = parts[i].type = PT_GASS;
+                t = parts[i].type = PT_GAS;
             if(t==PT_DESL && pv[y/CELL][x/CELL]>50.0f)      // Only way I know to make it
                 t = parts[i].type = PT_FIRE;                // combust under pressure.
-            if(t==PT_GASS && pv[y/CELL][x/CELL]>20.0f)
+            if(t==PT_GAS && pv[y/CELL][x/CELL]>20.0f)
                 t = parts[i].type = PT_DESL;
             if(t==PT_BMTL && pv[y/CELL][x/CELL]>2.5f)
                 t = parts[i].type = PT_BRMT;
@@ -1146,17 +1146,17 @@ void update_particles_i(pixel *vid, int start, int inc)
                             if((r&0xFF)==PT_WATR && 15>(rand()%100))
                                 parts[r>>8].type = PT_DSTW;
                             if((r&0xFF)==PT_PLEX && 15>(rand()%1000))
-                                parts[r>>8].type = PT_DFRM;
+                                parts[r>>8].type = PT_GOO;
                             if((r&0xFF)==PT_NITR && 15>(rand()%1000))
                                 parts[r>>8].type = PT_DESL;
-                            if((r&0xFF)==PT_OILL && 5>(rand()%1000))
+                            if((r&0xFF)==PT_OIL && 5>(rand()%1000))
                                 parts[r>>8].type = PT_PLAS;
                             if((r&0xFF)==PT_PLNT && 5>(rand()%100))
                                 parts[r>>8].type = PT_WOOD;
                             if((r&0xFF)==PT_PLAS && 5>(rand()%1000))
-                                parts[r>>8].type = PT_OILL;
+                                parts[r>>8].type = PT_OIL;
                             if((r&0xFF)==PT_DESL && 15>(rand()%1000))
-                                parts[r>>8].type = PT_GASS;
+                                parts[r>>8].type = PT_GAS;
                             if((r&0xFF)==PT_COAL && 5>(rand()%100))
                                 parts[r>>8].type = PT_WOOD;
                         }
diff --git a/powder.h b/powder.h
index 9757d5a4f..fa7543502 100644
--- a/powder.h
+++ b/powder.h
@@ -41,16 +41,16 @@
 #define PT_NONE	0
 #define PT_DUST	1
 #define PT_WATR	2
-#define PT_OILL 3
+#define PT_OIL 3
 #define PT_FIRE 4
 #define PT_STNE 5
 #define PT_LAVA 6
 #define PT_GUNP	7
 #define PT_NITR	8
 #define PT_CLNE 9
-#define PT_GASS 10
+#define PT_GAS 10
 #define PT_PLEX 11
-#define PT_DFRM 12
+#define PT_GOO 12
 #define PT_ICEI 13
 #define PT_METL 14
 #define PT_SPRK 15
@@ -306,7 +306,7 @@ static part_state pstates[PT_NUM] =
     /* STKM */ {ST_NONE,	PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f},
     /* SWCH */ {ST_SOLID,	PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f},
     /* SMKE */ {ST_SOLID,	PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f,		PT_NONE, 0.0f},
-    /* PLAS */ {ST_SOLID,   PT_NONE, 0.0f,      PT_OILL, 250.0f,    PT_NONE, 0.0f,      PT_NONE, 0.0f},
+    /* PLAS */ {ST_SOLID,   PT_NONE, 0.0f,      PT_OIL, 250.0f,    PT_NONE, 0.0f,      PT_NONE, 0.0f},
     /* DESL */ {ST_LIQUID,  PT_NONE, 0.0f,      PT_NONE, 0.0f,      PT_NONE, 0.0f,      PT_FIRE, 62.0f},
     /* COAL */ {ST_SOLID,   PT_NONE, 0.0f,      PT_NONE, 0.0f,      PT_NONE, 0.0f,      PT_FIRE, 600.0f},
     /* LO2  */ {ST_LIQUID,  PT_NONE, 0.0f,      PT_NONE, 0.0f,      PT_O2,   -180.0f,   PT_NONE, 0.0f},