3 files changed, 4 insertions, 5 deletions
diff --git a/source4/gtk/tools/gepdump.c b/source4/gtk/tools/gepdump.c
index 41d523b7ce..622d4b99aa 100644
--- a/source4/gtk/tools/gepdump.c
+++ b/source4/gtk/tools/gepdump.c
@@ -196,7 +196,7 @@ static void on_connect_clicked(GtkButton *btn, gpointer         user_data)
 	cli_credentials_set_gtk_callbacks(credentials);
 
 	status = dcerpc_pipe_connect(talloc_autofree_context(), &epmapper_pipe, bs, 
-				     DCERPC_EPMAPPER_UUID, DCERPC_EPMAPPER_VERSION, 
+					 &dcerpc_table_epmapper,
 				     credentials, NULL);
 
 	if (NT_STATUS_IS_ERR(status)) {
@@ -208,7 +208,7 @@ static void on_connect_clicked(GtkButton *btn, gpointer         user_data)
 
 	refresh_eps();
 
-	status = dcerpc_secondary_context(epmapper_pipe, &mgmt_pipe, DCERPC_MGMT_UUID, DCERPC_MGMT_VERSION);
+	status = dcerpc_secondary_context(epmapper_pipe, &mgmt_pipe, &dcerpc_table_mgmt);
 
 	if (NT_STATUS_IS_ERR(status)) {
 		mgmt_pipe = NULL;
diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index 647fdd2c16..fd4f41d06f 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -107,8 +107,7 @@ static void on_connect_activate(GtkMenuItem *menuitem, gpointer user_data)
 	
 	status = dcerpc_pipe_connect_b(mem_ctx, &at_pipe,
 				       gtk_rpc_binding_dialog_get_binding(d, mem_ctx),
-				       DCERPC_ATSVC_UUID,
-				       DCERPC_ATSVC_VERSION,
+					   &dcerpc_table_atsvc,
 				       credentials, NULL);
 
 	if(!NT_STATUS_IS_OK(status)) {
diff --git a/source4/gtk/tools/gwsam.c b/source4/gtk/tools/gwsam.c
index 644cc5c043..f1cf8d5e85 100644
--- a/source4/gtk/tools/gwsam.c
+++ b/source4/gtk/tools/gwsam.c
@@ -131,7 +131,7 @@ static void connect_sam(void)
 	/* If connected, get list of jobs */
 	status = dcerpc_pipe_connect_b(mem_ctx, &sam_pipe,
 				       gtk_rpc_binding_dialog_get_binding(d, mem_ctx),
-				       DCERPC_SAMR_UUID, DCERPC_SAMR_VERSION, cred, NULL);
+				       &dcerpc_table_samr, cred, NULL);
 
 	if(!NT_STATUS_IS_OK(status)) {
 		gtk_show_ntstatus(mainwin, "While connecting to SAMR interface", status);