diff --git a/ext/beplug_.h b/ext/beplug_.h
index 1c76835..668e5e6 100644
--- a/ext/beplug_.h
+++ b/ext/beplug_.h
@@ -2,7 +2,7 @@
 #define C_VINTG8IU 		0
 #define C_MASKEDVBYTE 	0			
   #endif
-  #if C_FASTPFOR
+  #if C_FASTPFOR128
 #include "FastPFor/headers/variablebyte.h"
 #include "FastPFor/headers/simple16.h"
 #include "FastPFor/headers/simple8b_rle.h"
diff --git a/ext/beplugc_.c b/ext/beplugc_.c
index e11939b..cadbf37 100644
--- a/ext/beplugc_.c
+++ b/ext/beplugc_.c
@@ -3,7 +3,7 @@
     case AM_SIMPLE8B:return vs8benc(  in, n, out);
       #endif
 	  
-	  #if C_FASTPFOR
+	  #if C_FASTPFOR128
 	case FP_FASTPFOR: {   
       size_t nvalue = outsize/4;
       FastPForLib::FastPFor<4> ic; ic.encodeArray((const uint32_t *)in, n & (~127), (uint32_t *)(out+4), nvalue);
diff --git a/ext/beplugd_.c b/ext/beplugd_.c
index 6b7b261..1e5aa6b 100644
--- a/ext/beplugd_.c
+++ b/ext/beplugd_.c
@@ -6,7 +6,7 @@
     case AM_SIMPLE8B:					 		return vs8bdec(  in, n, out); 
       #endif
 	  
-      #if C_FASTPFOR
+      #if C_FASTPFOR128
 	case FP_FASTPFOR: { 	
 	  size_t nvalue = n;
       FastPForLib::FastPFor<4> ic; const uint32_t *ip = ic.decodeArray((const uint32_t *)(in+4), ctou32(in), out, nvalue);
diff --git a/ext/beplugr_.h b/ext/beplugr_.h
index f0fff56..2d56784 100644
--- a/ext/beplugr_.h
+++ b/ext/beplugr_.h
@@ -13,13 +13,13 @@
   { P_MASKEDVBYTE,	"MaskedVbyte", 		C_MASKEDVBYTE,	0,    	 0,"","Variable byte SIMD" },
   { P_STREAMVBYTE,	"StreamVbyte", 		C_STREAMVBYTE,	0,    	 0,"","Variable byte SIMD" },
 
-  { FP_FASTPFOR,	"FP_FastPFor", 		C_FASTPFOR,	    0,    	 0,"","PFor scalar (inefficient for small blocks)" },
-  { FP_SIMDFASTPFOR,"FP_SimdFastPFor", 		C_FASTPFOR,	    0,    	 0,"","PFor SIMD (inefficient for small blocks)" },
-  { FP_OPTPFOR,		"FP_OptPFor",  		C_FASTPFOR,	    0,    	 0,"","OptPFor scalar" },
-  { FP_SIMDOPTPFOR,	"FP_SIMDOptPFor",  	C_FASTPFOR,	    0,    	 0,"","OptPFor SIMD" },
-  { FP_VBYTE,		"FP_VByte", 		C_FASTPFOR,	    0,    	 0,"","Variable byte" },
-  { FP_SIMPLE8BRLE,	"FP_Simple8bRLE", 	C_FASTPFOR,	    0,    	 0,"","Simple-8b + rle" },
-  { FP_GROUPSIMPLE,	"FP_GROUPSIMPLE", 	C_FASTPFOR,	    0,    	 0,"","Group Simple" },
+  { FP_FASTPFOR,	"FP_FastPFor", 		C_FASTPFOR128,	    0,    	 0,"","PFor scalar (inefficient for small blocks)" },
+  { FP_SIMDFASTPFOR,"FP_SimdFastPFor", 	C_FASTPFOR128,	    0,    	 0,"","PFor SIMD (inefficient for small blocks)" },
+  { FP_OPTPFOR,		"FP_OptPFor",  		C_FASTPFOR128,	    0,    	 0,"","OptPFor scalar" },
+  { FP_SIMDOPTPFOR,	"FP_SIMDOptPFor",  	C_FASTPFOR128,	    0,    	 0,"","OptPFor SIMD" },
+  { FP_VBYTE,		"FP_VByte", 		C_FASTPFOR128,	    0,    	 0,"","Variable byte" },
+  { FP_SIMPLE8BRLE,	"FP_Simple8bRLE", 	C_FASTPFOR128,	    0,    	 0,"","Simple-8b + rle" },
+  { FP_GROUPSIMPLE,	"FP_GROUPSIMPLE", 	C_FASTPFOR128,	    0,    	 0,"","Group Simple" },
 
   { SC_SIMDPACK128,	"SC_SIMDPack128", 	C_SIMDCOMP128,	BLK_V128,0,"","Bit packing (SSE4.1)"},
   { SC_SIMDPACK256,	"SC_SIMDPack256", 	C_SIMDCOMP128,	BLK_V256,0,"","Bit packing (SSE4.1)"},
diff --git a/ext/polycom/optpfd.o b/ext/polycom/optpfd.o
deleted file mode 100644
index 7b0e56c..0000000
Binary files a/ext/polycom/optpfd.o and /dev/null differ
diff --git a/ext/polycom/polyvbyte.o b/ext/polycom/polyvbyte.o
deleted file mode 100644
index b7d9ccd..0000000
Binary files a/ext/polycom/polyvbyte.o and /dev/null differ
diff --git a/ext/simdcomp_/simdfor.o b/ext/simdcomp_/simdfor.o
deleted file mode 100644
index 52169a2..0000000
Binary files a/ext/simdcomp_/simdfor.o and /dev/null differ