diff --git a/src/opendirectory_internal/include/opendirectory/odipc.h b/src/opendirectory_internal/include/opendirectory/odipc.h
index 580cc9da2..f57defea7 100644
--- a/src/opendirectory_internal/include/opendirectory/odipc.h
+++ b/src/opendirectory_internal/include/opendirectory/odipc.h
@@ -3,15 +3,15 @@
 
 #warning "TODO: These are good guesses, but figure out the real values"
 
-#define kODMachMembershipPortNameDebug 	"com.apple.private.opendirectoryd.rpc"
-#define kODMachMembershipPortName	"com.apple.private.opendirectoryd.rpc"
+#define kODMachMembershipPortNameDebug 	"com.apple.system.opendirectoryd.membership_debug"
+#define kODMachMembershipPortName	"com.apple.system.opendirectoryd.membership"
 
-#define kODMachLibinfoPortName "com.apple.private.opendirectoryd.rpc"
-#define kODMachLibinfoPortNameDebug "com.apple.private.opendirectoryd.rpc"
+#define kODMachLibinfoPortName "com.apple.system.opendirectoryd.libinfo"
+#define kODMachLibinfoPortNameDebug "com.apple.system.opendirectoryd.libinfo_debug"
 
 #define OD_RPC_NAME "rpc_name"
 #define OD_RPC_VERSION "rpc_version"
-#define OD_RPC_RESULT "rpc_result"
-#define OD_RPC_ERROR "rpc_error"
+#define OD_RPC_RESULT "result"
+#define OD_RPC_ERROR "error"
 
 #endif
diff --git a/src/opendirectory_internal/src/odconstants.c b/src/opendirectory_internal/src/odconstants.c
index 7beca79ee..020dcf31d 100644
--- a/src/opendirectory_internal/src/odconstants.c
+++ b/src/opendirectory_internal/src/odconstants.c
@@ -1,7 +1,7 @@
 #import <opendirectory/odconstants.h>
 
 #warning "TODO: These are good guesses, but figure out the real values"
-const char *kODAPIPortNameDebug = "com.apple.system.opendirectoryd.api";
+const char *kODAPIPortNameDebug = "com.apple.system.opendirectoryd.api_debug";
 const char *kODAPIPortName = "com.apple.system.opendirectoryd.api";
 
 const char *kODXPCReplyClientID = "kODXPCReplyClientID";