diff --git a/src/DCE_RPC.cc b/src/DCE_RPC.cc
index c8b715351c..c44b100aa5 100644
--- a/src/DCE_RPC.cc
+++ b/src/DCE_RPC.cc
@@ -234,7 +234,7 @@ void DCE_RPC_Session::DeliverPDU(int is_orig, int len, const u_char* data)
 		val_list* vl = new val_list;
 		vl->append(analyzer->BuildConnVal());
 		vl->append(new Val(is_orig, TYPE_BOOL));
-		vl->append(new EnumVal(data[2], BifTypePtr::Enum::dce_rpc_ptype));
+		vl->append(new EnumVal(data[2], BifType::Enum::dce_rpc_ptype));
 		vl->append(new StringVal(len, (const char*) data));
 
 		analyzer->ConnectionEvent(dce_rpc_message, vl);
@@ -296,7 +296,7 @@ void DCE_RPC_Session::DeliverBind(const binpac::DCE_RPC_Simple::DCE_RPC_PDU* pdu
 			val_list* vl = new val_list;
 			vl->append(analyzer->BuildConnVal());
 			vl->append(new StringVal(if_uuid.to_string()));
-			// vl->append(new EnumVal(if_id, BifTypePtr::Enum::dce_rpc_if_id));
+			// vl->append(new EnumVal(if_id, BifType::Enum::dce_rpc_if_id));
 
 			analyzer->ConnectionEvent(dce_rpc_bind, vl);
 			}
diff --git a/src/Portmap.cc b/src/Portmap.cc
index 7e2c06c9a6..bcf52daf4e 100644
--- a/src/Portmap.cc
+++ b/src/Portmap.cc
@@ -288,7 +288,7 @@ void PortmapperInterp::Event(EventHandlerPtr f, Val* request, int status, Val* r
 		}
 	else
 		{
-		vl->append(new EnumVal(status, BifTypePtr::Enum::rpc_status));
+		vl->append(new EnumVal(status, BifType::Enum::rpc_status));
 		if ( request )
 			vl->append(request);
 		}
diff --git a/src/builtin-func.y b/src/builtin-func.y
index cfd5459bb1..e5f5bf74fa 100644
--- a/src/builtin-func.y
+++ b/src/builtin-func.y
@@ -91,9 +91,9 @@ void set_decl_name(const char *name)
 
 	switch ( definition_type ) {
 	case TYPE_DEF:
-		decl.c_namespace_start = "namespace BifTypePtr { namespace " + type_name + "{ ";
+		decl.c_namespace_start = "namespace BifType { namespace " + type_name + "{ ";
 		decl.c_namespace_end = " } }";
-		decl.c_fullname = "BifTypePtr::" + type_name + "::";
+		decl.c_fullname = "BifType::" + type_name + "::";
 		break;
 
 	case CONST_DEF:
diff --git a/src/portmap-analyzer.pac b/src/portmap-analyzer.pac
index dc02ec1458..a7b64ada5d 100644
--- a/src/portmap-analyzer.pac
+++ b/src/portmap-analyzer.pac
@@ -150,7 +150,7 @@ function PortmapCallFailed(connection: RPC_Conn,
 			status: EnumRPCStatus): bool
 	%{
 	// BifEnum::rpc_status st = static_cast<BifEnum::rpc_status>(status);
-	Val *st = new EnumVal(status, BifTypePtr::Enum::rpc_status);
+	Val *st = new EnumVal(status, BifType::Enum::rpc_status);
 
 	switch ( call->proc() ) {
 	case PMAPPROC_NULL: