changed wks to wkssvc (suggestion from metze). Started adding samr_CreateUser().

(This used to be commit 04e9269c1e37c9c2984ee2886fa6c0eda5c19669)

10 files changed, 834 insertions, 602 deletions

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index a9891c9a19..2ff79c2fd3 100644
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -211,7 +211,13 @@
 
 	/************************/
 	/* Function    0x0c     */
-	NTSTATUS samr_CREATE_USER_IN_DOMAIN();
+	NTSTATUS samr_CreateUser(
+		[in,ref]      policy_handle *handle,
+		[in]          samr_Name *username,
+		[in]          uint32 access_mask,
+		[out]         policy_handle *acct_handle,
+		[out]         uint32 *rid
+		);
 
 	/************************/
 	/* Function    0x0d     */
@@ -240,7 +246,22 @@
 
 	/************************/
 	/* Function    0x10     */
-	NTSTATUS samr_GET_ALIAS_MEMBERSHIP();
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] dom_sid2 *sids;
+	} samr_Sids;
+
+	typedef struct {
+		uint32 count;
+		[size_is(count)] uint32 *rids;
+	} samr_Rids;
+
+	NTSTATUS samr_GetAliasMembership(
+		[in,ref]      policy_handle *handle,
+		[in]          samr_Sids *sids,
+		[out]         samr_Rids *rids
+		);
 
 	/************************/
 	/* Function    0x11     */
@@ -390,7 +411,9 @@
 
 	/************************/
 	/* Function    0x23     */
-	NTSTATUS samr_DELETE_DOM_USER();
+	NTSTATUS samr_DeleteUser(
+		[in,out]      policy_handle *handle
+		);
 
 	/************************/
 	/* Function    0x24     */
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index 1e82d3c767..4036527621 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -15,7 +15,7 @@
 		unistr *domain;
 		uint32 ver_major;
 		uint32 ver_minor;
-	} wks_Info100;
+	} wkssvc_Info100;
 
 	typedef struct {
 		uint32 platform_id;
@@ -24,7 +24,7 @@
 		uint32 ver_major;
 		uint32 ver_minor;
 		unistr *lan_root;
-	} wks_Info101;
+	} wkssvc_Info101;
 
 	typedef struct {
 		uint32 platform_id;
@@ -34,36 +34,36 @@
 		uint32 ver_minor;
 		unistr *lan_root;
 		uint32 logged_on_users;
-	} wks_Info102;
+	} wkssvc_Info102;
 
 	typedef union {
-		case (100) wks_Info100 *info100;
-		case (101) wks_Info101 *info101;
-		case (102) wks_Info102 *info102;
-	} wks_Info;
+		case (100) wkssvc_Info100 *info100;
+		case (101) wkssvc_Info101 *info101;
+		case (102) wkssvc_Info102 *info102;
+	} wkssvc_Info;
 
-	WERROR wks_QueryInfo(
+	WERROR wkssvc_QueryInfo(
 		[in]   unistr *server_name,
 		[in]   uint32 level,
-		[out,switch_is(level)]  wks_Info info
+		[out,switch_is(level)]  wkssvc_Info info
 		);
 
 
 	/******************/
 	/* Function: 0x01 */
-	WERROR wks_SetInfo();
+	WERROR wkssvc_SetInfo();
 
 	/*****************************/
 	/* Function        0x02      */
-	WERROR WKS_NETRWKSTAUSERENUM ();
+	WERROR WKSSVC_NETRWKSTAUSERENUM ();
 
 	/*****************************/
 	/* Function        0x03      */
-	WERROR WKS_NETRWKSTAUSERGETINFO ();
+	WERROR WKSSVC_NETRWKSTAUSERGETINFO ();
 
 	/*****************************/
 	/* Function        0x04      */
-	WERROR WKS_NETRWKSTAUSERSETINFO ();
+	WERROR WKSSVC_NETRWKSTAUSERSETINFO ();
 
 
 	/*****************************/
@@ -75,25 +75,25 @@
 		unistr *name;
 		unistr *address;
 		uint32 wan_link;
-	} wks_TransportInfo0;
+	} wkssvc_TransportInfo0;
 
 	typedef struct {
 		uint32 count;
-		[size_is(count)] wks_TransportInfo0 *transports;
-	} wks_TransportInfoArray;
+		[size_is(count)] wkssvc_TransportInfo0 *transports;
+	} wkssvc_TransportInfoArray;
 
 	typedef union {
-		case(0) wks_TransportInfoArray *array;
-	} wks_TransportUnion;
+		case(0) wkssvc_TransportInfoArray *array;
+	} wkssvc_TransportUnion;
 
 	typedef struct {
 		uint32 level;
-		[switch_is(level)] wks_TransportUnion u;
-	} wks_TransportInfo;
+		[switch_is(level)] wkssvc_TransportUnion u;
+	} wkssvc_TransportInfo;
 
-	WERROR wks_TransportEnum (
+	WERROR wkssvc_TransportEnum (
 		[in]         unistr *server_name,
-		[in,out,ref] wks_TransportInfo *info,
+		[in,out,ref] wkssvc_TransportInfo *info,
 		[in]         uint32 max_buffer,
 		[out]        uint32 unknown,
 		[in,out]     uint32 *resume_handle
@@ -102,101 +102,101 @@
 
 	/*****************************/
 	/* Function        0x06      */
-	WERROR WKS_NETRWKSTATRANSPORTADD ();
+	WERROR WKSSVC_NETRWKSTATRANSPORTADD ();
 
 	/*****************************/
 	/* Function        0x07      */
-	WERROR WKS_NETRWKSTATRANSPORTDEL ();
+	WERROR WKSSVC_NETRWKSTATRANSPORTDEL ();
 
 	/*****************************/
 	/* Function        0x08      */
-	WERROR WKS_NETRUSEADD ();
+	WERROR WKSSVC_NETRUSEADD ();
 
 	/*****************************/
 	/* Function        0x09      */
-	WERROR WKS_NETRUSEGETINFO ();
+	WERROR WKSSVC_NETRUSEGETINFO ();
 
 	/*****************************/
 	/* Function        0x0a      */
-	WERROR WKS_NETRUSEDEL ();
+	WERROR WKSSVC_NETRUSEDEL ();
 
 	/*****************************/
 	/* Function        0x0b      */
-	WERROR WKS_NETRUSEENUM ();
+	WERROR WKSSVC_NETRUSEENUM ();
 
 	/*****************************/
 	/* Function        0x0c      */
-	WERROR WKS_NETRMESSAGEBUFFERSEND ();
+	WERROR WKSSVC_NETRMESSAGEBUFFERSEND ();
 
 	/*****************************/
 	/* Function        0x0d      */
-	WERROR WKS_NETRWORKSTATIONSTATISTICSGET ();
+	WERROR WKSSVC_NETRWORKSTATIONSTATISTICSGET ();
 
 	/*****************************/
 	/* Function        0x0e      */
-	WERROR WKS_NETRLOGONDOMAINNAMEADD ();
+	WERROR WKSSVC_NETRLOGONDOMAINNAMEADD ();
 
 	/*****************************/
 	/* Function        0x0f      */
-	WERROR WKS_NETRLOGONDOMAINNAMEDEL ();
+	WERROR WKSSVC_NETRLOGONDOMAINNAMEDEL ();
 
 	/*****************************/
 	/* Function        0x10      */
-	WERROR WKS_NETRJOINDOMAIN ();
+	WERROR WKSSVC_NETRJOINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x11      */
-	WERROR WKS_NETRUNJOINDOMAIN ();
+	WERROR WKSSVC_NETRUNJOINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x12      */
-	WERROR WKS_NETRRENAMEMACHINEINDOMAIN ();
+	WERROR WKSSVC_NETRRENAMEMACHINEINDOMAIN ();
 
 	/*****************************/
 	/* Function        0x13      */
-	WERROR WKS_NETRVALIDATENAME ();
+	WERROR WKSSVC_NETRVALIDATENAME ();
 
 	/*****************************/
 	/* Function        0x14      */
-	WERROR WKS_NETRGETJOININFORMATION ();
+	WERROR WKSSVC_NETRGETJOININFORMATION ();
 
 	/*****************************/
 	/* Function        0x15      */
-	WERROR WKS_NETRGETJOINABLEOUS ();
+	WERROR WKSSVC_NETRGETJOINABLEOUS ();
 
 	/*****************************/
 	/* Function        0x16      */
-	WERROR WKS_NETRJOINDOMAIN2 ();
+	WERROR WKSSVC_NETRJOINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x17      */
-	WERROR WKS_NETRUNJOINDOMAIN2 ();
+	WERROR WKSSVC_NETRUNJOINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x18      */
-	WERROR WKS_NETRRENAMEMACHINEINDOMAIN2 ();
+	WERROR WKSSVC_NETRRENAMEMACHINEINDOMAIN2 ();
 
 	/*****************************/
 	/* Function        0x19      */
-	WERROR WKS_NETRVALIDATENAME2 ();
+	WERROR WKSSVC_NETRVALIDATENAME2 ();
 
 	/*****************************/
 	/* Function        0x1a      */
-	WERROR WKS_NETRGETJOINABLEOUS2 ();
+	WERROR WKSSVC_NETRGETJOINABLEOUS2 ();
 
 	/*****************************/
 	/* Function        0x1b      */
-	WERROR WKS_NETRADDALTERNATECOMPUTERNAME ();
+	WERROR WKSSVC_NETRADDALTERNATECOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1c      */
-	WERROR WKS_NETRREMOVEALTERNATECOMPUTERNAME ();
+	WERROR WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1d      */
-	WERROR WKS_NETRSETPRIMARYCOMPUTERNAME ();
+	WERROR WKSSVC_NETRSETPRIMARYCOMPUTERNAME ();
 
 	/*****************************/
 	/* Function        0x1e      */
-	WERROR WKS_NETRENUMERATECOMPUTERNAMES ();
+	WERROR WKSSVC_NETRENUMERATECOMPUTERNAMES ();
 }
diff --git a/source4/librpc/ndr/ndr_samr.c b/source4/librpc/ndr/ndr_samr.c
index f043a92484..2cd69fb819 100644
--- a/source4/librpc/ndr/ndr_samr.c
+++ b/source4/librpc/ndr/ndr_samr.c
@@ -113,8 +113,14 @@ NTSTATUS ndr_push_samr_EnumDomainGroups(struct ndr_push *ndr, struct samr_EnumDo
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_samr_CREATE_USER_IN_DOMAIN(struct ndr_push *ndr, struct samr_CREATE_USER_IN_DOMAIN *r)
+NTSTATUS ndr_push_samr_CreateUser(struct ndr_push *ndr, struct samr_CreateUser *r)
 {
+	NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle));
+	NDR_CHECK(ndr_push_ptr(ndr, r->in.username));
+	if (r->in.username) {
+		NDR_CHECK(ndr_push_samr_Name(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.username));
+	}
+	NDR_CHECK(ndr_push_uint32(ndr, r->in.access_mask));
 
 	return NT_STATUS_OK;
 }
@@ -144,8 +150,31 @@ NTSTATUS ndr_push_samr_EnumDomainAliases(struct ndr_push *ndr, struct samr_EnumD
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_samr_GET_ALIAS_MEMBERSHIP(struct ndr_push *ndr, struct samr_GET_ALIAS_MEMBERSHIP *r)
+NTSTATUS ndr_push_samr_Sids(struct ndr_push *ndr, int ndr_flags, struct samr_Sids *r)
 {
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_push_struct_start(ndr));
+	NDR_CHECK(ndr_push_align(ndr, 4));
+	NDR_CHECK(ndr_push_uint32(ndr, r->count));
+	NDR_CHECK(ndr_push_ptr(ndr, r->sids));
+	ndr_push_struct_end(ndr);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->sids) {
+		NDR_CHECK(ndr_push_uint32(ndr, r->count));
+		NDR_CHECK(ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, r->sids, sizeof(r->sids[0]), r->count, (ndr_push_flags_fn_t)ndr_push_dom_sid2));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_push_samr_GetAliasMembership(struct ndr_push *ndr, struct samr_GetAliasMembership *r)
+{
+	NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle));
+	NDR_CHECK(ndr_push_ptr(ndr, r->in.sids));
+	if (r->in.sids) {
+		NDR_CHECK(ndr_push_samr_Sids(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.sids));
+	}
 
 	return NT_STATUS_OK;
 }
@@ -271,8 +300,12 @@ NTSTATUS ndr_push_samr_OpenUser(struct ndr_push *ndr, struct samr_OpenUser *r)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_samr_DELETE_DOM_USER(struct ndr_push *ndr, struct samr_DELETE_DOM_USER *r)
+NTSTATUS ndr_push_samr_DeleteUser(struct ndr_push *ndr, struct samr_DeleteUser *r)
 {
+	NDR_CHECK(ndr_push_ptr(ndr, r->in.handle));
+	if (r->in.handle) {
+		NDR_CHECK(ndr_push_policy_handle(ndr, r->in.handle));
+	}
 
 	return NT_STATUS_OK;
 }
@@ -1015,8 +1048,28 @@ NTSTATUS ndr_pull_samr_EnumDomainGroups(struct ndr_pull *ndr, struct samr_EnumDo
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_samr_CREATE_USER_IN_DOMAIN(struct ndr_pull *ndr, struct samr_CREATE_USER_IN_DOMAIN *r)
+NTSTATUS ndr_pull_samr_CreateUser(struct ndr_pull *ndr, struct samr_CreateUser *r)
 {
+	uint32 _ptr_acct_handle;
+	uint32 _ptr_rid;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_acct_handle));
+	if (_ptr_acct_handle) {
+		NDR_ALLOC(ndr, r->out.acct_handle);
+	} else {
+		r->out.acct_handle = NULL;
+	}
+	if (r->out.acct_handle) {
+		NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.acct_handle));
+	}
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_rid));
+	if (_ptr_rid) {
+		NDR_ALLOC(ndr, r->out.rid);
+	} else {
+		r->out.rid = NULL;
+	}
+	if (r->out.rid) {
+		NDR_CHECK(ndr_pull_uint32(ndr, r->out.rid));
+	}
 	NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
@@ -1067,8 +1120,49 @@ NTSTATUS ndr_pull_samr_EnumDomainAliases(struct ndr_pull *ndr, struct samr_EnumD
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_samr_GET_ALIAS_MEMBERSHIP(struct ndr_pull *ndr, struct samr_GET_ALIAS_MEMBERSHIP *r)
+NTSTATUS ndr_pull_samr_Rids(struct ndr_pull *ndr, int ndr_flags, struct samr_Rids *r)
 {
+	uint32 _ptr_rids;
+	NDR_CHECK(ndr_pull_struct_start(ndr));
+	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
+	NDR_CHECK(ndr_pull_align(ndr, 4));
+	NDR_CHECK(ndr_pull_uint32(ndr, &r->count));
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_rids));
+	if (_ptr_rids) {
+		NDR_ALLOC(ndr, r->rids);
+	} else {
+		r->rids = NULL;
+	}
+	ndr_pull_struct_end(ndr);
+buffers:
+	if (!(ndr_flags & NDR_BUFFERS)) goto done;
+	if (r->rids) {
+	{
+		uint32 _array_size;
+		NDR_CHECK(ndr_pull_uint32(ndr, &_array_size));
+		if (r->count > _array_size) {
+			return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should be %u", _array_size, r->count);
+		}
+	}
+		NDR_ALLOC_N_SIZE(ndr, r->rids, r->count, sizeof(r->rids[0]));
+		NDR_CHECK(ndr_pull_array_uint32(ndr, NDR_SCALARS|NDR_BUFFERS, r->rids, r->count));
+	}
+done:
+	return NT_STATUS_OK;
+}
+
+NTSTATUS ndr_pull_samr_GetAliasMembership(struct ndr_pull *ndr, struct samr_GetAliasMembership *r)
+{
+	uint32 _ptr_rids;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_rids));
+	if (_ptr_rids) {
+		NDR_ALLOC(ndr, r->out.rids);
+	} else {
+		r->out.rids = NULL;
+	}
+	if (r->out.rids) {
+		NDR_CHECK(ndr_pull_samr_Rids(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.rids));
+	}
 	NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
@@ -1429,8 +1523,18 @@ NTSTATUS ndr_pull_samr_OpenUser(struct ndr_pull *ndr, struct samr_OpenUser *r)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_samr_DELETE_DOM_USER(struct ndr_pull *ndr, struct samr_DELETE_DOM_USER *r)
+NTSTATUS ndr_pull_samr_DeleteUser(struct ndr_pull *ndr, struct samr_DeleteUser *r)
 {
+	uint32 _ptr_handle;
+	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_handle));
+	if (_ptr_handle) {
+		NDR_ALLOC(ndr, r->out.handle);
+	} else {
+		r->out.handle = NULL;
+	}
+	if (r->out.handle) {
+		NDR_CHECK(ndr_pull_policy_handle(ndr, r->out.handle));
+	}
 	NDR_CHECK(ndr_pull_NTSTATUS(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
@@ -2858,18 +2962,41 @@ void ndr_print_samr_EnumDomainGroups(struct ndr_print *ndr, const char *name, in
 	ndr->depth--;
 }
 
-void ndr_print_samr_CREATE_USER_IN_DOMAIN(struct ndr_print *ndr, const char *name, int flags, struct samr_CREATE_USER_IN_DOMAIN *r)
+void ndr_print_samr_CreateUser(struct ndr_print *ndr, const char *name, int flags, struct samr_CreateUser *r)
 {
-	ndr_print_struct(ndr, name, "samr_CREATE_USER_IN_DOMAIN");
+	ndr_print_struct(ndr, name, "samr_CreateUser");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "samr_CREATE_USER_IN_DOMAIN");
+		ndr_print_struct(ndr, "in", "samr_CreateUser");
+	ndr->depth++;
+	ndr_print_ptr(ndr, "handle", r->in.handle);
+	ndr->depth++;
+		ndr_print_policy_handle(ndr, "handle", r->in.handle);
+	ndr->depth--;
+	ndr_print_ptr(ndr, "username", r->in.username);
 	ndr->depth++;
+	if (r->in.username) {
+		ndr_print_samr_Name(ndr, "username", r->in.username);
+	}
+	ndr->depth--;
+	ndr_print_uint32(ndr, "access_mask", r->in.access_mask);
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "samr_CREATE_USER_IN_DOMAIN");
+		ndr_print_struct(ndr, "out", "samr_CreateUser");
 	ndr->depth++;
+	ndr_print_ptr(ndr, "acct_handle", r->out.acct_handle);
+	ndr->depth++;
+	if (r->out.acct_handle) {
+		ndr_print_policy_handle(ndr, "acct_handle", r->out.acct_handle);
+	}
+	ndr->depth--;
+	ndr_print_ptr(ndr, "rid", r->out.rid);
+	ndr->depth++;
+	if (r->out.rid) {
+		ndr_print_uint32(ndr, "rid", *r->out.rid);
+	}
+	ndr->depth--;
 	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
@@ -2971,18 +3098,62 @@ void ndr_print_samr_EnumDomainAliases(struct ndr_print *ndr, const char *name, i
 	ndr->depth--;
 }
 
-void ndr_print_samr_GET_ALIAS_MEMBERSHIP(struct ndr_print *ndr, const char *name, int flags, struct samr_GET_ALIAS_MEMBERSHIP *r)
+void ndr_print_samr_Sids(struct ndr_print *ndr, const char *name, struct samr_Sids *r)
 {
-	ndr_print_struct(ndr, name, "samr_GET_ALIAS_MEMBERSHIP");
+	ndr_print_struct(ndr, name, "samr_Sids");
+	ndr->depth++;
+	ndr_print_uint32(ndr, "count", r->count);
+	ndr_print_ptr(ndr, "sids", r->sids);
+	ndr->depth++;
+	if (r->sids) {
+		ndr_print_array(ndr, "sids", r->sids, sizeof(r->sids[0]), r->count, (ndr_print_fn_t)ndr_print_dom_sid2);
+	}
+	ndr->depth--;
+	ndr->depth--;
+}
+
+void ndr_print_samr_Rids(struct ndr_print *ndr, const char *name, struct samr_Rids *r)
+{
+	ndr_print_struct(ndr, name, "samr_Rids");
+	ndr->depth++;
+	ndr_print_uint32(ndr, "count", r->count);
+	ndr_print_ptr(ndr, "rids", r->rids);
+	ndr->depth++;
+	if (r->rids) {
+		ndr_print_array_uint32(ndr, "rids", r->rids, r->count);
+	}
+	ndr->depth--;
+	ndr->depth--;
+}
+
+void ndr_print_samr_GetAliasMembership(struct ndr_print *ndr, const char *name, int flags, struct samr_GetAliasMembership *r)
+{
+	ndr_print_struct(ndr, name, "samr_GetAliasMembership");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "samr_GET_ALIAS_MEMBERSHIP");
+		ndr_print_struct(ndr, "in", "samr_GetAliasMembership");
 	ndr->depth++;
+	ndr_print_ptr(ndr, "handle", r->in.handle);
+	ndr->depth++;
+		ndr_print_policy_handle(ndr, "handle", r->in.handle);
+	ndr->depth--;
+	ndr_print_ptr(ndr, "sids", r->in.sids);
+	ndr->depth++;
+	if (r->in.sids) {
+		ndr_print_samr_Sids(ndr, "sids", r->in.sids);
+	}
+	ndr->depth--;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "samr_GET_ALIAS_MEMBERSHIP");
+		ndr_print_struct(ndr, "out", "samr_GetAliasMembership");
 	ndr->depth++;
+	ndr_print_ptr(ndr, "rids", r->out.rids);
+	ndr->depth++;
+	if (r->out.rids) {
+		ndr_print_samr_Rids(ndr, "rids", r->out.rids);
+	}
+	ndr->depth--;
 	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
@@ -3472,18 +3643,30 @@ void ndr_print_samr_OpenUser(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth--;
 }
 
-void ndr_print_samr_DELETE_DOM_USER(struct ndr_print *ndr, const char *name, int flags, struct samr_DELETE_DOM_USER *r)
+void ndr_print_samr_DeleteUser(struct ndr_print *ndr, const char *name, int flags, struct samr_DeleteUser *r)
 {
-	ndr_print_struct(ndr, name, "samr_DELETE_DOM_USER");
+	ndr_print_struct(ndr, name, "samr_DeleteUser");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "samr_DELETE_DOM_USER");
+		ndr_print_struct(ndr, "in", "samr_DeleteUser");
 	ndr->depth++;
+	ndr_print_ptr(ndr, "handle", r->in.handle);
+	ndr->depth++;
+	if (r->in.handle) {
+		ndr_print_policy_handle(ndr, "handle", r->in.handle);
+	}
+	ndr->depth--;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "samr_DELETE_DOM_USER");
+		ndr_print_struct(ndr, "out", "samr_DeleteUser");
+	ndr->depth++;
+	ndr_print_ptr(ndr, "handle", r->out.handle);
 	ndr->depth++;
+	if (r->out.handle) {
+		ndr_print_policy_handle(ndr, "handle", r->out.handle);
+	}
+	ndr->depth--;
 	ndr_print_NTSTATUS(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
diff --git a/source4/librpc/ndr/ndr_samr.h b/source4/librpc/ndr/ndr_samr.h
index 2542396341..b7b568b034 100644
--- a/source4/librpc/ndr/ndr_samr.h
+++ b/source4/librpc/ndr/ndr_samr.h
@@ -16,11 +16,11 @@
 #define DCERPC_SAMR_SET_DOMAIN_INFO 9
 #define DCERPC_SAMR_CREATE_DOM_GROUP 10
 #define DCERPC_SAMR_ENUMDOMAINGROUPS 11
-#define DCERPC_SAMR_CREATE_USER_IN_DOMAIN 12
+#define DCERPC_SAMR_CREATEUSER 12
 #define DCERPC_SAMR_ENUMDOMAINUSERS 13
 #define DCERPC_SAMR_CREATE_DOM_ALIAS 14
 #define DCERPC_SAMR_ENUMDOMAINALIASES 15
-#define DCERPC_SAMR_GET_ALIAS_MEMBERSHIP 16
+#define DCERPC_SAMR_GETALIASMEMBERSHIP 16
 #define DCERPC_SAMR_LOOKUP_NAMES 17
 #define DCERPC_SAMR_LOOKUP_RIDS 18
 #define DCERPC_SAMR_OPENGROUP 19
@@ -39,7 +39,7 @@
 #define DCERPC_SAMR_DEL_ALIASMEM 32
 #define DCERPC_SAMR_GET_MEMBERS_IN_ALIAS 33
 #define DCERPC_SAMR_OPENUSER 34
-#define DCERPC_SAMR_DELETE_DOM_USER 35
+#define DCERPC_SAMR_DELETEUSER 35
 #define DCERPC_SAMR_QUERYUSERINFO 36
 #define DCERPC_SAMR_SET_USERINFO 37
 #define DCERPC_SAMR_CHANGE_PASSWORD_USER 38
@@ -337,11 +337,16 @@ struct samr_EnumDomainGroups {
 
 };
 
-struct samr_CREATE_USER_IN_DOMAIN {
+struct samr_CreateUser {
 	struct {
+		struct policy_handle *handle;
+		struct samr_Name *username;
+		uint32 access_mask;
 	} in;
 
 	struct {
+		struct policy_handle *acct_handle;
+		uint32 *rid;
 		NTSTATUS result;
 	} out;
 
@@ -390,11 +395,24 @@ struct samr_EnumDomainAliases {
 
 };
 
-struct samr_GET_ALIAS_MEMBERSHIP {
+struct samr_Sids {
+	uint32 count;
+	struct dom_sid2 *sids;
+};
+
+struct samr_Rids {
+	uint32 count;
+	uint32 *rids;
+};
+
+struct samr_GetAliasMembership {
 	struct {
+		struct policy_handle *handle;
+		struct samr_Sids *sids;
 	} in;
 
 	struct {
+		struct samr_Rids *rids;
 		NTSTATUS result;
 	} out;
 
@@ -644,11 +662,13 @@ struct samr_OpenUser {
 
 };
 
-struct samr_DELETE_DOM_USER {
+struct samr_DeleteUser {
 	struct {
+		struct policy_handle *handle;
 	} in;
 
 	struct {
+		struct policy_handle *handle;
 		NTSTATUS result;
 	} out;
 
diff --git a/source4/librpc/ndr/ndr_wkssvc.c b/source4/librpc/ndr/ndr_wkssvc.c
index 40d3f0ad2b..48e63c93e1 100644
--- a/source4/librpc/ndr/ndr_wkssvc.c
+++ b/source4/librpc/ndr/ndr_wkssvc.c
@@ -2,7 +2,7 @@
 
 #include "includes.h"
 
-NTSTATUS ndr_push_wks_QueryInfo(struct ndr_push *ndr, struct wks_QueryInfo *r)
+NTSTATUS ndr_push_wkssvc_QueryInfo(struct ndr_push *ndr, struct wkssvc_QueryInfo *r)
 {
 	NDR_CHECK(ndr_push_ptr(ndr, r->in.server_name));
 	if (r->in.server_name) {
@@ -13,31 +13,31 @@ NTSTATUS ndr_push_wks_QueryInfo(struct ndr_push *ndr, struct wks_QueryInfo *r)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_SetInfo(struct ndr_push *ndr, struct wks_SetInfo *r)
+NTSTATUS ndr_push_wkssvc_SetInfo(struct ndr_push *ndr, struct wkssvc_SetInfo *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWKSTAUSERENUM(struct ndr_push *ndr, struct WKS_NETRWKSTAUSERENUM *r)
+NTSTATUS ndr_push_WKSSVC_NETRWKSTAUSERENUM(struct ndr_push *ndr, struct WKSSVC_NETRWKSTAUSERENUM *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWKSTAUSERGETINFO(struct ndr_push *ndr, struct WKS_NETRWKSTAUSERGETINFO *r)
+NTSTATUS ndr_push_WKSSVC_NETRWKSTAUSERGETINFO(struct ndr_push *ndr, struct WKSSVC_NETRWKSTAUSERGETINFO *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWKSTAUSERSETINFO(struct ndr_push *ndr, struct WKS_NETRWKSTAUSERSETINFO *r)
+NTSTATUS ndr_push_WKSSVC_NETRWKSTAUSERSETINFO(struct ndr_push *ndr, struct WKSSVC_NETRWKSTAUSERSETINFO *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_TransportInfo0(struct ndr_push *ndr, int ndr_flags, struct wks_TransportInfo0 *r)
+NTSTATUS ndr_push_wkssvc_TransportInfo0(struct ndr_push *ndr, int ndr_flags, struct wkssvc_TransportInfo0 *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_struct_start(ndr));
@@ -60,7 +60,7 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_TransportInfoArray(struct ndr_push *ndr, int ndr_flags, struct wks_TransportInfoArray *r)
+NTSTATUS ndr_push_wkssvc_TransportInfoArray(struct ndr_push *ndr, int ndr_flags, struct wkssvc_TransportInfoArray *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_struct_start(ndr));
@@ -72,13 +72,13 @@ buffers:
 	if (!(ndr_flags & NDR_BUFFERS)) goto done;
 	if (r->transports) {
 		NDR_CHECK(ndr_push_uint32(ndr, r->count));
-		NDR_CHECK(ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, r->transports, sizeof(r->transports[0]), r->count, (ndr_push_flags_fn_t)ndr_push_wks_TransportInfo0));
+		NDR_CHECK(ndr_push_array(ndr, NDR_SCALARS|NDR_BUFFERS, r->transports, sizeof(r->transports[0]), r->count, (ndr_push_flags_fn_t)ndr_push_wkssvc_TransportInfo0));
 	}
 done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_TransportUnion(struct ndr_push *ndr, int ndr_flags, uint16 level, union wks_TransportUnion *r)
+NTSTATUS ndr_push_wkssvc_TransportUnion(struct ndr_push *ndr, int ndr_flags, uint16 level, union wkssvc_TransportUnion *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_struct_start(ndr));
@@ -97,7 +97,7 @@ buffers:
 	switch (level) {
 	case 0:
 	if (r->array) {
-		NDR_CHECK(ndr_push_wks_TransportInfoArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->array));
+		NDR_CHECK(ndr_push_wkssvc_TransportInfoArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->array));
 	}
 	break;
 
@@ -108,28 +108,28 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_TransportInfo(struct ndr_push *ndr, int ndr_flags, struct wks_TransportInfo *r)
+NTSTATUS ndr_push_wkssvc_TransportInfo(struct ndr_push *ndr, int ndr_flags, struct wkssvc_TransportInfo *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_push_struct_start(ndr));
 	NDR_CHECK(ndr_push_align(ndr, 4));
 	NDR_CHECK(ndr_push_uint32(ndr, r->level));
-	NDR_CHECK(ndr_push_wks_TransportUnion(ndr, NDR_SCALARS, r->level, &r->u));
+	NDR_CHECK(ndr_push_wkssvc_TransportUnion(ndr, NDR_SCALARS, r->level, &r->u));
 	ndr_push_struct_end(ndr);
 buffers:
 	if (!(ndr_flags & NDR_BUFFERS)) goto done;
-	NDR_CHECK(ndr_push_wks_TransportUnion(ndr, NDR_BUFFERS, r->level, &r->u));
+	NDR_CHECK(ndr_push_wkssvc_TransportUnion(ndr, NDR_BUFFERS, r->level, &r->u));
 done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_wks_TransportEnum(struct ndr_push *ndr, struct wks_TransportEnum *r)
+NTSTATUS ndr_push_wkssvc_TransportEnum(struct ndr_push *ndr, struct wkssvc_TransportEnum *r)
 {
 	NDR_CHECK(ndr_push_ptr(ndr, r->in.server_name));
 	if (r->in.server_name) {
 		NDR_CHECK(ndr_push_unistr(ndr, r->in.server_name));
 	}
-	NDR_CHECK(ndr_push_wks_TransportInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
+	NDR_CHECK(ndr_push_wkssvc_TransportInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.info));
 	NDR_CHECK(ndr_push_uint32(ndr, r->in.max_buffer));
 	NDR_CHECK(ndr_push_ptr(ndr, r->in.resume_handle));
 	if (r->in.resume_handle) {
@@ -139,157 +139,157 @@ NTSTATUS ndr_push_wks_TransportEnum(struct ndr_push *ndr, struct wks_TransportEn
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWKSTATRANSPORTADD(struct ndr_push *ndr, struct WKS_NETRWKSTATRANSPORTADD *r)
+NTSTATUS ndr_push_WKSSVC_NETRWKSTATRANSPORTADD(struct ndr_push *ndr, struct WKSSVC_NETRWKSTATRANSPORTADD *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWKSTATRANSPORTDEL(struct ndr_push *ndr, struct WKS_NETRWKSTATRANSPORTDEL *r)
+NTSTATUS ndr_push_WKSSVC_NETRWKSTATRANSPORTDEL(struct ndr_push *ndr, struct WKSSVC_NETRWKSTATRANSPORTDEL *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUSEADD(struct ndr_push *ndr, struct WKS_NETRUSEADD *r)
+NTSTATUS ndr_push_WKSSVC_NETRUSEADD(struct ndr_push *ndr, struct WKSSVC_NETRUSEADD *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUSEGETINFO(struct ndr_push *ndr, struct WKS_NETRUSEGETINFO *r)
+NTSTATUS ndr_push_WKSSVC_NETRUSEGETINFO(struct ndr_push *ndr, struct WKSSVC_NETRUSEGETINFO *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUSEDEL(struct ndr_push *ndr, struct WKS_NETRUSEDEL *r)
+NTSTATUS ndr_push_WKSSVC_NETRUSEDEL(struct ndr_push *ndr, struct WKSSVC_NETRUSEDEL *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUSEENUM(struct ndr_push *ndr, struct WKS_NETRUSEENUM *r)
+NTSTATUS ndr_push_WKSSVC_NETRUSEENUM(struct ndr_push *ndr, struct WKSSVC_NETRUSEENUM *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRMESSAGEBUFFERSEND(struct ndr_push *ndr, struct WKS_NETRMESSAGEBUFFERSEND *r)
+NTSTATUS ndr_push_WKSSVC_NETRMESSAGEBUFFERSEND(struct ndr_push *ndr, struct WKSSVC_NETRMESSAGEBUFFERSEND *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRWORKSTATIONSTATISTICSGET(struct ndr_push *ndr, struct WKS_NETRWORKSTATIONSTATISTICSGET *r)
+NTSTATUS ndr_push_WKSSVC_NETRWORKSTATIONSTATISTICSGET(struct ndr_push *ndr, struct WKSSVC_NETRWORKSTATIONSTATISTICSGET *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRLOGONDOMAINNAMEADD(struct ndr_push *ndr, struct WKS_NETRLOGONDOMAINNAMEADD *r)
+NTSTATUS ndr_push_WKSSVC_NETRLOGONDOMAINNAMEADD(struct ndr_push *ndr, struct WKSSVC_NETRLOGONDOMAINNAMEADD *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRLOGONDOMAINNAMEDEL(struct ndr_push *ndr, struct WKS_NETRLOGONDOMAINNAMEDEL *r)
+NTSTATUS ndr_push_WKSSVC_NETRLOGONDOMAINNAMEDEL(struct ndr_push *ndr, struct WKSSVC_NETRLOGONDOMAINNAMEDEL *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRJOINDOMAIN(struct ndr_push *ndr, struct WKS_NETRJOINDOMAIN *r)
+NTSTATUS ndr_push_WKSSVC_NETRJOINDOMAIN(struct ndr_push *ndr, struct WKSSVC_NETRJOINDOMAIN *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUNJOINDOMAIN(struct ndr_push *ndr, struct WKS_NETRUNJOINDOMAIN *r)
+NTSTATUS ndr_push_WKSSVC_NETRUNJOINDOMAIN(struct ndr_push *ndr, struct WKSSVC_NETRUNJOINDOMAIN *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRRENAMEMACHINEINDOMAIN(struct ndr_push *ndr, struct WKS_NETRRENAMEMACHINEINDOMAIN *r)
+NTSTATUS ndr_push_WKSSVC_NETRRENAMEMACHINEINDOMAIN(struct ndr_push *ndr, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRVALIDATENAME(struct ndr_push *ndr, struct WKS_NETRVALIDATENAME *r)
+NTSTATUS ndr_push_WKSSVC_NETRVALIDATENAME(struct ndr_push *ndr, struct WKSSVC_NETRVALIDATENAME *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRGETJOININFORMATION(struct ndr_push *ndr, struct WKS_NETRGETJOININFORMATION *r)
+NTSTATUS ndr_push_WKSSVC_NETRGETJOININFORMATION(struct ndr_push *ndr, struct WKSSVC_NETRGETJOININFORMATION *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRGETJOINABLEOUS(struct ndr_push *ndr, struct WKS_NETRGETJOINABLEOUS *r)
+NTSTATUS ndr_push_WKSSVC_NETRGETJOINABLEOUS(struct ndr_push *ndr, struct WKSSVC_NETRGETJOINABLEOUS *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRJOINDOMAIN2(struct ndr_push *ndr, struct WKS_NETRJOINDOMAIN2 *r)
+NTSTATUS ndr_push_WKSSVC_NETRJOINDOMAIN2(struct ndr_push *ndr, struct WKSSVC_NETRJOINDOMAIN2 *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRUNJOINDOMAIN2(struct ndr_push *ndr, struct WKS_NETRUNJOINDOMAIN2 *r)
+NTSTATUS ndr_push_WKSSVC_NETRUNJOINDOMAIN2(struct ndr_push *ndr, struct WKSSVC_NETRUNJOINDOMAIN2 *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRRENAMEMACHINEINDOMAIN2(struct ndr_push *ndr, struct WKS_NETRRENAMEMACHINEINDOMAIN2 *r)
+NTSTATUS ndr_push_WKSSVC_NETRRENAMEMACHINEINDOMAIN2(struct ndr_push *ndr, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN2 *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRVALIDATENAME2(struct ndr_push *ndr, struct WKS_NETRVALIDATENAME2 *r)
+NTSTATUS ndr_push_WKSSVC_NETRVALIDATENAME2(struct ndr_push *ndr, struct WKSSVC_NETRVALIDATENAME2 *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRGETJOINABLEOUS2(struct ndr_push *ndr, struct WKS_NETRGETJOINABLEOUS2 *r)
+NTSTATUS ndr_push_WKSSVC_NETRGETJOINABLEOUS2(struct ndr_push *ndr, struct WKSSVC_NETRGETJOINABLEOUS2 *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRADDALTERNATECOMPUTERNAME(struct ndr_push *ndr, struct WKS_NETRADDALTERNATECOMPUTERNAME *r)
+NTSTATUS ndr_push_WKSSVC_NETRADDALTERNATECOMPUTERNAME(struct ndr_push *ndr, struct WKSSVC_NETRADDALTERNATECOMPUTERNAME *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_push *ndr, struct WKS_NETRREMOVEALTERNATECOMPUTERNAME *r)
+NTSTATUS ndr_push_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_push *ndr, struct WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRSETPRIMARYCOMPUTERNAME(struct ndr_push *ndr, struct WKS_NETRSETPRIMARYCOMPUTERNAME *r)
+NTSTATUS ndr_push_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(struct ndr_push *ndr, struct WKSSVC_NETRSETPRIMARYCOMPUTERNAME *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_push_WKS_NETRENUMERATECOMPUTERNAMES(struct ndr_push *ndr, struct WKS_NETRENUMERATECOMPUTERNAMES *r)
+NTSTATUS ndr_push_WKSSVC_NETRENUMERATECOMPUTERNAMES(struct ndr_push *ndr, struct WKSSVC_NETRENUMERATECOMPUTERNAMES *r)
 {
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_Info100(struct ndr_pull *ndr, int ndr_flags, struct wks_Info100 *r)
+NTSTATUS ndr_pull_wkssvc_Info100(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_Info100 *r)
 {
 	uint32 _ptr_server;
 	uint32 _ptr_domain;
@@ -324,7 +324,7 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_Info101(struct ndr_pull *ndr, int ndr_flags, struct wks_Info101 *r)
+NTSTATUS ndr_pull_wkssvc_Info101(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_Info101 *r)
 {
 	uint32 _ptr_server;
 	uint32 _ptr_domain;
@@ -369,7 +369,7 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_Info102(struct ndr_pull *ndr, int ndr_flags, struct wks_Info102 *r)
+NTSTATUS ndr_pull_wkssvc_Info102(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_Info102 *r)
 {
 	uint32 _ptr_server;
 	uint32 _ptr_domain;
@@ -415,7 +415,7 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_Info(struct ndr_pull *ndr, int ndr_flags, uint16 *level, union wks_Info *r)
+NTSTATUS ndr_pull_wkssvc_Info(struct ndr_pull *ndr, int ndr_flags, uint16 *level, union wkssvc_Info *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_pull_struct_start(ndr));
@@ -460,19 +460,19 @@ buffers:
 	switch (*level) {
 	case 100:
 	if (r->info100) {
-		NDR_CHECK(ndr_pull_wks_Info100(ndr, NDR_SCALARS|NDR_BUFFERS, r->info100));
+		NDR_CHECK(ndr_pull_wkssvc_Info100(ndr, NDR_SCALARS|NDR_BUFFERS, r->info100));
 	}
 	break;
 
 	case 101:
 	if (r->info101) {
-		NDR_CHECK(ndr_pull_wks_Info101(ndr, NDR_SCALARS|NDR_BUFFERS, r->info101));
+		NDR_CHECK(ndr_pull_wkssvc_Info101(ndr, NDR_SCALARS|NDR_BUFFERS, r->info101));
 	}
 	break;
 
 	case 102:
 	if (r->info102) {
-		NDR_CHECK(ndr_pull_wks_Info102(ndr, NDR_SCALARS|NDR_BUFFERS, r->info102));
+		NDR_CHECK(ndr_pull_wkssvc_Info102(ndr, NDR_SCALARS|NDR_BUFFERS, r->info102));
 	}
 	break;
 
@@ -483,10 +483,10 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_QueryInfo(struct ndr_pull *ndr, struct wks_QueryInfo *r)
+NTSTATUS ndr_pull_wkssvc_QueryInfo(struct ndr_pull *ndr, struct wkssvc_QueryInfo *r)
 {
 	{ uint16 _level = r->in.level;
-	NDR_CHECK(ndr_pull_wks_Info(ndr, NDR_SCALARS|NDR_BUFFERS, &_level, &r->out.info));
+	NDR_CHECK(ndr_pull_wkssvc_Info(ndr, NDR_SCALARS|NDR_BUFFERS, &_level, &r->out.info));
 	if (((NDR_SCALARS|NDR_BUFFERS) & NDR_SCALARS) && (_level != r->in.level)) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in info");
 	}
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
@@ -494,35 +494,35 @@ NTSTATUS ndr_pull_wks_QueryInfo(struct ndr_pull *ndr, struct wks_QueryInfo *r)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_SetInfo(struct ndr_pull *ndr, struct wks_SetInfo *r)
+NTSTATUS ndr_pull_wkssvc_SetInfo(struct ndr_pull *ndr, struct wkssvc_SetInfo *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWKSTAUSERENUM(struct ndr_pull *ndr, struct WKS_NETRWKSTAUSERENUM *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWKSTAUSERENUM(struct ndr_pull *ndr, struct WKSSVC_NETRWKSTAUSERENUM *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWKSTAUSERGETINFO(struct ndr_pull *ndr, struct WKS_NETRWKSTAUSERGETINFO *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWKSTAUSERGETINFO(struct ndr_pull *ndr, struct WKSSVC_NETRWKSTAUSERGETINFO *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWKSTAUSERSETINFO(struct ndr_pull *ndr, struct WKS_NETRWKSTAUSERSETINFO *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWKSTAUSERSETINFO(struct ndr_pull *ndr, struct WKSSVC_NETRWKSTAUSERSETINFO *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_TransportInfo0(struct ndr_pull *ndr, int ndr_flags, struct wks_TransportInfo0 *r)
+NTSTATUS ndr_pull_wkssvc_TransportInfo0(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_TransportInfo0 *r)
 {
 	uint32 _ptr_name;
 	uint32 _ptr_address;
@@ -557,7 +557,7 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_TransportInfoArray(struct ndr_pull *ndr, int ndr_flags, struct wks_TransportInfoArray *r)
+NTSTATUS ndr_pull_wkssvc_TransportInfoArray(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_TransportInfoArray *r)
 {
 	uint32 _ptr_transports;
 	NDR_CHECK(ndr_pull_struct_start(ndr));
@@ -582,13 +582,13 @@ buffers:
 		}
 	}
 		NDR_ALLOC_N_SIZE(ndr, r->transports, r->count, sizeof(r->transports[0]));
-		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->transports, sizeof(r->transports[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_wks_TransportInfo0));
+		NDR_CHECK(ndr_pull_array(ndr, NDR_SCALARS|NDR_BUFFERS, (void **)r->transports, sizeof(r->transports[0]), r->count, (ndr_pull_flags_fn_t)ndr_pull_wkssvc_TransportInfo0));
 	}
 done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_TransportUnion(struct ndr_pull *ndr, int ndr_flags, uint16 *level, union wks_TransportUnion *r)
+NTSTATUS ndr_pull_wkssvc_TransportUnion(struct ndr_pull *ndr, int ndr_flags, uint16 *level, union wkssvc_TransportUnion *r)
 {
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_pull_struct_start(ndr));
@@ -613,7 +613,7 @@ buffers:
 	switch (*level) {
 	case 0:
 	if (r->array) {
-		NDR_CHECK(ndr_pull_wks_TransportInfoArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->array));
+		NDR_CHECK(ndr_pull_wkssvc_TransportInfoArray(ndr, NDR_SCALARS|NDR_BUFFERS, r->array));
 	}
 	break;
 
@@ -624,31 +624,31 @@ done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_TransportInfo(struct ndr_pull *ndr, int ndr_flags, struct wks_TransportInfo *r)
+NTSTATUS ndr_pull_wkssvc_TransportInfo(struct ndr_pull *ndr, int ndr_flags, struct wkssvc_TransportInfo *r)
 {
 	NDR_CHECK(ndr_pull_struct_start(ndr));
 	if (!(ndr_flags & NDR_SCALARS)) goto buffers;
 	NDR_CHECK(ndr_pull_align(ndr, 4));
 	NDR_CHECK(ndr_pull_uint32(ndr, &r->level));
 	{ uint16 _level = r->level;
-	NDR_CHECK(ndr_pull_wks_TransportUnion(ndr, NDR_SCALARS, &_level, &r->u));
+	NDR_CHECK(ndr_pull_wkssvc_TransportUnion(ndr, NDR_SCALARS, &_level, &r->u));
 	if (((NDR_SCALARS) & NDR_SCALARS) && (_level != r->level)) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in u");
 	}
 	ndr_pull_struct_end(ndr);
 buffers:
 	if (!(ndr_flags & NDR_BUFFERS)) goto done;
 	{ uint16 _level = r->level;
-	NDR_CHECK(ndr_pull_wks_TransportUnion(ndr, NDR_BUFFERS, &_level, &r->u));
+	NDR_CHECK(ndr_pull_wkssvc_TransportUnion(ndr, NDR_BUFFERS, &_level, &r->u));
 	if (((NDR_BUFFERS) & NDR_SCALARS) && (_level != r->level)) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in u");
 	}
 done:
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_wks_TransportEnum(struct ndr_pull *ndr, struct wks_TransportEnum *r)
+NTSTATUS ndr_pull_wkssvc_TransportEnum(struct ndr_pull *ndr, struct wkssvc_TransportEnum *r)
 {
 	uint32 _ptr_resume_handle;
-	NDR_CHECK(ndr_pull_wks_TransportInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
+	NDR_CHECK(ndr_pull_wkssvc_TransportInfo(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.info));
 	NDR_CHECK(ndr_pull_uint32(ndr, &r->out.unknown));
 	NDR_CHECK(ndr_pull_uint32(ndr, &_ptr_resume_handle));
 	if (_ptr_resume_handle) {
@@ -664,184 +664,184 @@ NTSTATUS ndr_pull_wks_TransportEnum(struct ndr_pull *ndr, struct wks_TransportEn
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWKSTATRANSPORTADD(struct ndr_pull *ndr, struct WKS_NETRWKSTATRANSPORTADD *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWKSTATRANSPORTADD(struct ndr_pull *ndr, struct WKSSVC_NETRWKSTATRANSPORTADD *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWKSTATRANSPORTDEL(struct ndr_pull *ndr, struct WKS_NETRWKSTATRANSPORTDEL *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWKSTATRANSPORTDEL(struct ndr_pull *ndr, struct WKSSVC_NETRWKSTATRANSPORTDEL *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUSEADD(struct ndr_pull *ndr, struct WKS_NETRUSEADD *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUSEADD(struct ndr_pull *ndr, struct WKSSVC_NETRUSEADD *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUSEGETINFO(struct ndr_pull *ndr, struct WKS_NETRUSEGETINFO *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUSEGETINFO(struct ndr_pull *ndr, struct WKSSVC_NETRUSEGETINFO *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUSEDEL(struct ndr_pull *ndr, struct WKS_NETRUSEDEL *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUSEDEL(struct ndr_pull *ndr, struct WKSSVC_NETRUSEDEL *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUSEENUM(struct ndr_pull *ndr, struct WKS_NETRUSEENUM *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUSEENUM(struct ndr_pull *ndr, struct WKSSVC_NETRUSEENUM *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRMESSAGEBUFFERSEND(struct ndr_pull *ndr, struct WKS_NETRMESSAGEBUFFERSEND *r)
+NTSTATUS ndr_pull_WKSSVC_NETRMESSAGEBUFFERSEND(struct ndr_pull *ndr, struct WKSSVC_NETRMESSAGEBUFFERSEND *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRWORKSTATIONSTATISTICSGET(struct ndr_pull *ndr, struct WKS_NETRWORKSTATIONSTATISTICSGET *r)
+NTSTATUS ndr_pull_WKSSVC_NETRWORKSTATIONSTATISTICSGET(struct ndr_pull *ndr, struct WKSSVC_NETRWORKSTATIONSTATISTICSGET *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRLOGONDOMAINNAMEADD(struct ndr_pull *ndr, struct WKS_NETRLOGONDOMAINNAMEADD *r)
+NTSTATUS ndr_pull_WKSSVC_NETRLOGONDOMAINNAMEADD(struct ndr_pull *ndr, struct WKSSVC_NETRLOGONDOMAINNAMEADD *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRLOGONDOMAINNAMEDEL(struct ndr_pull *ndr, struct WKS_NETRLOGONDOMAINNAMEDEL *r)
+NTSTATUS ndr_pull_WKSSVC_NETRLOGONDOMAINNAMEDEL(struct ndr_pull *ndr, struct WKSSVC_NETRLOGONDOMAINNAMEDEL *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRJOINDOMAIN(struct ndr_pull *ndr, struct WKS_NETRJOINDOMAIN *r)
+NTSTATUS ndr_pull_WKSSVC_NETRJOINDOMAIN(struct ndr_pull *ndr, struct WKSSVC_NETRJOINDOMAIN *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUNJOINDOMAIN(struct ndr_pull *ndr, struct WKS_NETRUNJOINDOMAIN *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUNJOINDOMAIN(struct ndr_pull *ndr, struct WKSSVC_NETRUNJOINDOMAIN *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRRENAMEMACHINEINDOMAIN(struct ndr_pull *ndr, struct WKS_NETRRENAMEMACHINEINDOMAIN *r)
+NTSTATUS ndr_pull_WKSSVC_NETRRENAMEMACHINEINDOMAIN(struct ndr_pull *ndr, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRVALIDATENAME(struct ndr_pull *ndr, struct WKS_NETRVALIDATENAME *r)
+NTSTATUS ndr_pull_WKSSVC_NETRVALIDATENAME(struct ndr_pull *ndr, struct WKSSVC_NETRVALIDATENAME *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRGETJOININFORMATION(struct ndr_pull *ndr, struct WKS_NETRGETJOININFORMATION *r)
+NTSTATUS ndr_pull_WKSSVC_NETRGETJOININFORMATION(struct ndr_pull *ndr, struct WKSSVC_NETRGETJOININFORMATION *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRGETJOINABLEOUS(struct ndr_pull *ndr, struct WKS_NETRGETJOINABLEOUS *r)
+NTSTATUS ndr_pull_WKSSVC_NETRGETJOINABLEOUS(struct ndr_pull *ndr, struct WKSSVC_NETRGETJOINABLEOUS *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRJOINDOMAIN2(struct ndr_pull *ndr, struct WKS_NETRJOINDOMAIN2 *r)
+NTSTATUS ndr_pull_WKSSVC_NETRJOINDOMAIN2(struct ndr_pull *ndr, struct WKSSVC_NETRJOINDOMAIN2 *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRUNJOINDOMAIN2(struct ndr_pull *ndr, struct WKS_NETRUNJOINDOMAIN2 *r)
+NTSTATUS ndr_pull_WKSSVC_NETRUNJOINDOMAIN2(struct ndr_pull *ndr, struct WKSSVC_NETRUNJOINDOMAIN2 *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRRENAMEMACHINEINDOMAIN2(struct ndr_pull *ndr, struct WKS_NETRRENAMEMACHINEINDOMAIN2 *r)
+NTSTATUS ndr_pull_WKSSVC_NETRRENAMEMACHINEINDOMAIN2(struct ndr_pull *ndr, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN2 *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRVALIDATENAME2(struct ndr_pull *ndr, struct WKS_NETRVALIDATENAME2 *r)
+NTSTATUS ndr_pull_WKSSVC_NETRVALIDATENAME2(struct ndr_pull *ndr, struct WKSSVC_NETRVALIDATENAME2 *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRGETJOINABLEOUS2(struct ndr_pull *ndr, struct WKS_NETRGETJOINABLEOUS2 *r)
+NTSTATUS ndr_pull_WKSSVC_NETRGETJOINABLEOUS2(struct ndr_pull *ndr, struct WKSSVC_NETRGETJOINABLEOUS2 *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRADDALTERNATECOMPUTERNAME(struct ndr_pull *ndr, struct WKS_NETRADDALTERNATECOMPUTERNAME *r)
+NTSTATUS ndr_pull_WKSSVC_NETRADDALTERNATECOMPUTERNAME(struct ndr_pull *ndr, struct WKSSVC_NETRADDALTERNATECOMPUTERNAME *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_pull *ndr, struct WKS_NETRREMOVEALTERNATECOMPUTERNAME *r)
+NTSTATUS ndr_pull_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_pull *ndr, struct WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRSETPRIMARYCOMPUTERNAME(struct ndr_pull *ndr, struct WKS_NETRSETPRIMARYCOMPUTERNAME *r)
+NTSTATUS ndr_pull_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(struct ndr_pull *ndr, struct WKSSVC_NETRSETPRIMARYCOMPUTERNAME *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-NTSTATUS ndr_pull_WKS_NETRENUMERATECOMPUTERNAMES(struct ndr_pull *ndr, struct WKS_NETRENUMERATECOMPUTERNAMES *r)
+NTSTATUS ndr_pull_WKSSVC_NETRENUMERATECOMPUTERNAMES(struct ndr_pull *ndr, struct WKSSVC_NETRENUMERATECOMPUTERNAMES *r)
 {
 	NDR_CHECK(ndr_pull_WERROR(ndr, &r->out.result));
 
 	return NT_STATUS_OK;
 }
 
-void ndr_print_wks_Info100(struct ndr_print *ndr, const char *name, struct wks_Info100 *r)
+void ndr_print_wkssvc_Info100(struct ndr_print *ndr, const char *name, struct wkssvc_Info100 *r)
 {
-	ndr_print_struct(ndr, name, "wks_Info100");
+	ndr_print_struct(ndr, name, "wkssvc_Info100");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "platform_id", r->platform_id);
 	ndr_print_ptr(ndr, "server", r->server);
@@ -861,9 +861,9 @@ void ndr_print_wks_Info100(struct ndr_print *ndr, const char *name, struct wks_I
 	ndr->depth--;
 }
 
-void ndr_print_wks_Info101(struct ndr_print *ndr, const char *name, struct wks_Info101 *r)
+void ndr_print_wkssvc_Info101(struct ndr_print *ndr, const char *name, struct wkssvc_Info101 *r)
 {
-	ndr_print_struct(ndr, name, "wks_Info101");
+	ndr_print_struct(ndr, name, "wkssvc_Info101");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "platform_id", r->platform_id);
 	ndr_print_ptr(ndr, "server", r->server);
@@ -889,9 +889,9 @@ void ndr_print_wks_Info101(struct ndr_print *ndr, const char *name, struct wks_I
 	ndr->depth--;
 }
 
-void ndr_print_wks_Info102(struct ndr_print *ndr, const char *name, struct wks_Info102 *r)
+void ndr_print_wkssvc_Info102(struct ndr_print *ndr, const char *name, struct wkssvc_Info102 *r)
 {
-	ndr_print_struct(ndr, name, "wks_Info102");
+	ndr_print_struct(ndr, name, "wkssvc_Info102");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "platform_id", r->platform_id);
 	ndr_print_ptr(ndr, "server", r->server);
@@ -918,15 +918,15 @@ void ndr_print_wks_Info102(struct ndr_print *ndr, const char *name, struct wks_I
 	ndr->depth--;
 }
 
-void ndr_print_wks_Info(struct ndr_print *ndr, const char *name, uint16 level, union wks_Info *r)
+void ndr_print_wkssvc_Info(struct ndr_print *ndr, const char *name, uint16 level, union wkssvc_Info *r)
 {
-	ndr_print_union(ndr, name, level, "wks_Info");
+	ndr_print_union(ndr, name, level, "wkssvc_Info");
 	switch (level) {
 	case 100:
 	ndr_print_ptr(ndr, "info100", r->info100);
 	ndr->depth++;
 	if (r->info100) {
-		ndr_print_wks_Info100(ndr, "info100", r->info100);
+		ndr_print_wkssvc_Info100(ndr, "info100", r->info100);
 	}
 	ndr->depth--;
 	break;
@@ -935,7 +935,7 @@ void ndr_print_wks_Info(struct ndr_print *ndr, const char *name, uint16 level, u
 	ndr_print_ptr(ndr, "info101", r->info101);
 	ndr->depth++;
 	if (r->info101) {
-		ndr_print_wks_Info101(ndr, "info101", r->info101);
+		ndr_print_wkssvc_Info101(ndr, "info101", r->info101);
 	}
 	ndr->depth--;
 	break;
@@ -944,7 +944,7 @@ void ndr_print_wks_Info(struct ndr_print *ndr, const char *name, uint16 level, u
 	ndr_print_ptr(ndr, "info102", r->info102);
 	ndr->depth++;
 	if (r->info102) {
-		ndr_print_wks_Info102(ndr, "info102", r->info102);
+		ndr_print_wkssvc_Info102(ndr, "info102", r->info102);
 	}
 	ndr->depth--;
 	break;
@@ -954,12 +954,12 @@ void ndr_print_wks_Info(struct ndr_print *ndr, const char *name, uint16 level, u
 	}
 }
 
-void ndr_print_wks_QueryInfo(struct ndr_print *ndr, const char *name, int flags, struct wks_QueryInfo *r)
+void ndr_print_wkssvc_QueryInfo(struct ndr_print *ndr, const char *name, int flags, struct wkssvc_QueryInfo *r)
 {
-	ndr_print_struct(ndr, name, "wks_QueryInfo");
+	ndr_print_struct(ndr, name, "wkssvc_QueryInfo");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "wks_QueryInfo");
+		ndr_print_struct(ndr, "in", "wkssvc_QueryInfo");
 	ndr->depth++;
 	ndr_print_ptr(ndr, "server_name", r->in.server_name);
 	ndr->depth++;
@@ -971,26 +971,26 @@ void ndr_print_wks_QueryInfo(struct ndr_print *ndr, const char *name, int flags,
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "wks_QueryInfo");
+		ndr_print_struct(ndr, "out", "wkssvc_QueryInfo");
 	ndr->depth++;
-	ndr_print_wks_Info(ndr, "info", r->in.level, &r->out.info);
+	ndr_print_wkssvc_Info(ndr, "info", r->in.level, &r->out.info);
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
 	}
 	ndr->depth--;
 }
 
-void ndr_print_wks_SetInfo(struct ndr_print *ndr, const char *name, int flags, struct wks_SetInfo *r)
+void ndr_print_wkssvc_SetInfo(struct ndr_print *ndr, const char *name, int flags, struct wkssvc_SetInfo *r)
 {
-	ndr_print_struct(ndr, name, "wks_SetInfo");
+	ndr_print_struct(ndr, name, "wkssvc_SetInfo");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "wks_SetInfo");
+		ndr_print_struct(ndr, "in", "wkssvc_SetInfo");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "wks_SetInfo");
+		ndr_print_struct(ndr, "out", "wkssvc_SetInfo");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -998,17 +998,17 @@ void ndr_print_wks_SetInfo(struct ndr_print *ndr, const char *name, int flags, s
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWKSTAUSERENUM(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWKSTAUSERENUM *r)
+void ndr_print_WKSSVC_NETRWKSTAUSERENUM(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWKSTAUSERENUM *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWKSTAUSERENUM");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWKSTAUSERENUM");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWKSTAUSERENUM");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWKSTAUSERENUM");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWKSTAUSERENUM");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWKSTAUSERENUM");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1016,17 +1016,17 @@ void ndr_print_WKS_NETRWKSTAUSERENUM(struct ndr_print *ndr, const char *name, in
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWKSTAUSERGETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWKSTAUSERGETINFO *r)
+void ndr_print_WKSSVC_NETRWKSTAUSERGETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWKSTAUSERGETINFO *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWKSTAUSERGETINFO");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWKSTAUSERGETINFO");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWKSTAUSERGETINFO");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWKSTAUSERGETINFO");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWKSTAUSERGETINFO");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWKSTAUSERGETINFO");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1034,17 +1034,17 @@ void ndr_print_WKS_NETRWKSTAUSERGETINFO(struct ndr_print *ndr, const char *name,
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWKSTAUSERSETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWKSTAUSERSETINFO *r)
+void ndr_print_WKSSVC_NETRWKSTAUSERSETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWKSTAUSERSETINFO *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWKSTAUSERSETINFO");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWKSTAUSERSETINFO");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWKSTAUSERSETINFO");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWKSTAUSERSETINFO");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWKSTAUSERSETINFO");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWKSTAUSERSETINFO");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1052,9 +1052,9 @@ void ndr_print_WKS_NETRWKSTAUSERSETINFO(struct ndr_print *ndr, const char *name,
 	ndr->depth--;
 }
 
-void ndr_print_wks_TransportInfo0(struct ndr_print *ndr, const char *name, struct wks_TransportInfo0 *r)
+void ndr_print_wkssvc_TransportInfo0(struct ndr_print *ndr, const char *name, struct wkssvc_TransportInfo0 *r)
 {
-	ndr_print_struct(ndr, name, "wks_TransportInfo0");
+	ndr_print_struct(ndr, name, "wkssvc_TransportInfo0");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "quality_of_service", r->quality_of_service);
 	ndr_print_uint32(ndr, "vc_count", r->vc_count);
@@ -1074,29 +1074,29 @@ void ndr_print_wks_TransportInfo0(struct ndr_print *ndr, const char *name, struc
 	ndr->depth--;
 }
 
-void ndr_print_wks_TransportInfoArray(struct ndr_print *ndr, const char *name, struct wks_TransportInfoArray *r)
+void ndr_print_wkssvc_TransportInfoArray(struct ndr_print *ndr, const char *name, struct wkssvc_TransportInfoArray *r)
 {
-	ndr_print_struct(ndr, name, "wks_TransportInfoArray");
+	ndr_print_struct(ndr, name, "wkssvc_TransportInfoArray");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "count", r->count);
 	ndr_print_ptr(ndr, "transports", r->transports);
 	ndr->depth++;
 	if (r->transports) {
-		ndr_print_array(ndr, "transports", r->transports, sizeof(r->transports[0]), r->count, (ndr_print_fn_t)ndr_print_wks_TransportInfo0);
+		ndr_print_array(ndr, "transports", r->transports, sizeof(r->transports[0]), r->count, (ndr_print_fn_t)ndr_print_wkssvc_TransportInfo0);
 	}
 	ndr->depth--;
 	ndr->depth--;
 }
 
-void ndr_print_wks_TransportUnion(struct ndr_print *ndr, const char *name, uint16 level, union wks_TransportUnion *r)
+void ndr_print_wkssvc_TransportUnion(struct ndr_print *ndr, const char *name, uint16 level, union wkssvc_TransportUnion *r)
 {
-	ndr_print_union(ndr, name, level, "wks_TransportUnion");
+	ndr_print_union(ndr, name, level, "wkssvc_TransportUnion");
 	switch (level) {
 	case 0:
 	ndr_print_ptr(ndr, "array", r->array);
 	ndr->depth++;
 	if (r->array) {
-		ndr_print_wks_TransportInfoArray(ndr, "array", r->array);
+		ndr_print_wkssvc_TransportInfoArray(ndr, "array", r->array);
 	}
 	ndr->depth--;
 	break;
@@ -1106,21 +1106,21 @@ void ndr_print_wks_TransportUnion(struct ndr_print *ndr, const char *name, uint1
 	}
 }
 
-void ndr_print_wks_TransportInfo(struct ndr_print *ndr, const char *name, struct wks_TransportInfo *r)
+void ndr_print_wkssvc_TransportInfo(struct ndr_print *ndr, const char *name, struct wkssvc_TransportInfo *r)
 {
-	ndr_print_struct(ndr, name, "wks_TransportInfo");
+	ndr_print_struct(ndr, name, "wkssvc_TransportInfo");
 	ndr->depth++;
 	ndr_print_uint32(ndr, "level", r->level);
-	ndr_print_wks_TransportUnion(ndr, "u", r->level, &r->u);
+	ndr_print_wkssvc_TransportUnion(ndr, "u", r->level, &r->u);
 	ndr->depth--;
 }
 
-void ndr_print_wks_TransportEnum(struct ndr_print *ndr, const char *name, int flags, struct wks_TransportEnum *r)
+void ndr_print_wkssvc_TransportEnum(struct ndr_print *ndr, const char *name, int flags, struct wkssvc_TransportEnum *r)
 {
-	ndr_print_struct(ndr, name, "wks_TransportEnum");
+	ndr_print_struct(ndr, name, "wkssvc_TransportEnum");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "wks_TransportEnum");
+		ndr_print_struct(ndr, "in", "wkssvc_TransportEnum");
 	ndr->depth++;
 	ndr_print_ptr(ndr, "server_name", r->in.server_name);
 	ndr->depth++;
@@ -1130,7 +1130,7 @@ void ndr_print_wks_TransportEnum(struct ndr_print *ndr, const char *name, int fl
 	ndr->depth--;
 	ndr_print_ptr(ndr, "info", r->in.info);
 	ndr->depth++;
-		ndr_print_wks_TransportInfo(ndr, "info", r->in.info);
+		ndr_print_wkssvc_TransportInfo(ndr, "info", r->in.info);
 	ndr->depth--;
 	ndr_print_uint32(ndr, "max_buffer", r->in.max_buffer);
 	ndr_print_ptr(ndr, "resume_handle", r->in.resume_handle);
@@ -1142,11 +1142,11 @@ void ndr_print_wks_TransportEnum(struct ndr_print *ndr, const char *name, int fl
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "wks_TransportEnum");
+		ndr_print_struct(ndr, "out", "wkssvc_TransportEnum");
 	ndr->depth++;
 	ndr_print_ptr(ndr, "info", r->out.info);
 	ndr->depth++;
-		ndr_print_wks_TransportInfo(ndr, "info", r->out.info);
+		ndr_print_wkssvc_TransportInfo(ndr, "info", r->out.info);
 	ndr->depth--;
 	ndr_print_uint32(ndr, "unknown", r->out.unknown);
 	ndr_print_ptr(ndr, "resume_handle", r->out.resume_handle);
@@ -1161,17 +1161,17 @@ void ndr_print_wks_TransportEnum(struct ndr_print *ndr, const char *name, int fl
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWKSTATRANSPORTADD(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWKSTATRANSPORTADD *r)
+void ndr_print_WKSSVC_NETRWKSTATRANSPORTADD(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWKSTATRANSPORTADD *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWKSTATRANSPORTADD");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWKSTATRANSPORTADD");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWKSTATRANSPORTADD");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWKSTATRANSPORTADD");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWKSTATRANSPORTADD");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWKSTATRANSPORTADD");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1179,17 +1179,17 @@ void ndr_print_WKS_NETRWKSTATRANSPORTADD(struct ndr_print *ndr, const char *name
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWKSTATRANSPORTDEL(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWKSTATRANSPORTDEL *r)
+void ndr_print_WKSSVC_NETRWKSTATRANSPORTDEL(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWKSTATRANSPORTDEL *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWKSTATRANSPORTDEL");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWKSTATRANSPORTDEL");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWKSTATRANSPORTDEL");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWKSTATRANSPORTDEL");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWKSTATRANSPORTDEL");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWKSTATRANSPORTDEL");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1197,17 +1197,17 @@ void ndr_print_WKS_NETRWKSTATRANSPORTDEL(struct ndr_print *ndr, const char *name
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUSEADD(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUSEADD *r)
+void ndr_print_WKSSVC_NETRUSEADD(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUSEADD *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUSEADD");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUSEADD");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUSEADD");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUSEADD");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUSEADD");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUSEADD");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1215,17 +1215,17 @@ void ndr_print_WKS_NETRUSEADD(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUSEGETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUSEGETINFO *r)
+void ndr_print_WKSSVC_NETRUSEGETINFO(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUSEGETINFO *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUSEGETINFO");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUSEGETINFO");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUSEGETINFO");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUSEGETINFO");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUSEGETINFO");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUSEGETINFO");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1233,17 +1233,17 @@ void ndr_print_WKS_NETRUSEGETINFO(struct ndr_print *ndr, const char *name, int f
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUSEDEL(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUSEDEL *r)
+void ndr_print_WKSSVC_NETRUSEDEL(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUSEDEL *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUSEDEL");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUSEDEL");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUSEDEL");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUSEDEL");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUSEDEL");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUSEDEL");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1251,17 +1251,17 @@ void ndr_print_WKS_NETRUSEDEL(struct ndr_print *ndr, const char *name, int flags
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUSEENUM(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUSEENUM *r)
+void ndr_print_WKSSVC_NETRUSEENUM(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUSEENUM *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUSEENUM");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUSEENUM");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUSEENUM");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUSEENUM");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUSEENUM");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUSEENUM");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1269,17 +1269,17 @@ void ndr_print_WKS_NETRUSEENUM(struct ndr_print *ndr, const char *name, int flag
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRMESSAGEBUFFERSEND(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRMESSAGEBUFFERSEND *r)
+void ndr_print_WKSSVC_NETRMESSAGEBUFFERSEND(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRMESSAGEBUFFERSEND *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRMESSAGEBUFFERSEND");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRMESSAGEBUFFERSEND");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRMESSAGEBUFFERSEND");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRMESSAGEBUFFERSEND");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRMESSAGEBUFFERSEND");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRMESSAGEBUFFERSEND");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1287,17 +1287,17 @@ void ndr_print_WKS_NETRMESSAGEBUFFERSEND(struct ndr_print *ndr, const char *name
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRWORKSTATIONSTATISTICSGET(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRWORKSTATIONSTATISTICSGET *r)
+void ndr_print_WKSSVC_NETRWORKSTATIONSTATISTICSGET(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRWORKSTATIONSTATISTICSGET *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRWORKSTATIONSTATISTICSGET");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRWORKSTATIONSTATISTICSGET");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRWORKSTATIONSTATISTICSGET");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRWORKSTATIONSTATISTICSGET");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRWORKSTATIONSTATISTICSGET");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRWORKSTATIONSTATISTICSGET");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1305,17 +1305,17 @@ void ndr_print_WKS_NETRWORKSTATIONSTATISTICSGET(struct ndr_print *ndr, const cha
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRLOGONDOMAINNAMEADD(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRLOGONDOMAINNAMEADD *r)
+void ndr_print_WKSSVC_NETRLOGONDOMAINNAMEADD(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRLOGONDOMAINNAMEADD *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRLOGONDOMAINNAMEADD");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRLOGONDOMAINNAMEADD");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRLOGONDOMAINNAMEADD");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRLOGONDOMAINNAMEADD");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRLOGONDOMAINNAMEADD");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRLOGONDOMAINNAMEADD");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1323,17 +1323,17 @@ void ndr_print_WKS_NETRLOGONDOMAINNAMEADD(struct ndr_print *ndr, const char *nam
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRLOGONDOMAINNAMEDEL(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRLOGONDOMAINNAMEDEL *r)
+void ndr_print_WKSSVC_NETRLOGONDOMAINNAMEDEL(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRLOGONDOMAINNAMEDEL *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRLOGONDOMAINNAMEDEL");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRLOGONDOMAINNAMEDEL");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRLOGONDOMAINNAMEDEL");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRLOGONDOMAINNAMEDEL");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRLOGONDOMAINNAMEDEL");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRLOGONDOMAINNAMEDEL");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1341,17 +1341,17 @@ void ndr_print_WKS_NETRLOGONDOMAINNAMEDEL(struct ndr_print *ndr, const char *nam
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRJOINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRJOINDOMAIN *r)
+void ndr_print_WKSSVC_NETRJOINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRJOINDOMAIN *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRJOINDOMAIN");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRJOINDOMAIN");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRJOINDOMAIN");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRJOINDOMAIN");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRJOINDOMAIN");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRJOINDOMAIN");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1359,17 +1359,17 @@ void ndr_print_WKS_NETRJOINDOMAIN(struct ndr_print *ndr, const char *name, int f
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUNJOINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUNJOINDOMAIN *r)
+void ndr_print_WKSSVC_NETRUNJOINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUNJOINDOMAIN *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUNJOINDOMAIN");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUNJOINDOMAIN");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUNJOINDOMAIN");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUNJOINDOMAIN");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUNJOINDOMAIN");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUNJOINDOMAIN");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1377,17 +1377,17 @@ void ndr_print_WKS_NETRUNJOINDOMAIN(struct ndr_print *ndr, const char *name, int
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRRENAMEMACHINEINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRRENAMEMACHINEINDOMAIN *r)
+void ndr_print_WKSSVC_NETRRENAMEMACHINEINDOMAIN(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRRENAMEMACHINEINDOMAIN");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRRENAMEMACHINEINDOMAIN");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRRENAMEMACHINEINDOMAIN");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRRENAMEMACHINEINDOMAIN");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRRENAMEMACHINEINDOMAIN");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRRENAMEMACHINEINDOMAIN");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1395,17 +1395,17 @@ void ndr_print_WKS_NETRRENAMEMACHINEINDOMAIN(struct ndr_print *ndr, const char *
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRVALIDATENAME(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRVALIDATENAME *r)
+void ndr_print_WKSSVC_NETRVALIDATENAME(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRVALIDATENAME *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRVALIDATENAME");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRVALIDATENAME");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRVALIDATENAME");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRVALIDATENAME");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRVALIDATENAME");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRVALIDATENAME");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1413,17 +1413,17 @@ void ndr_print_WKS_NETRVALIDATENAME(struct ndr_print *ndr, const char *name, int
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRGETJOININFORMATION(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRGETJOININFORMATION *r)
+void ndr_print_WKSSVC_NETRGETJOININFORMATION(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRGETJOININFORMATION *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRGETJOININFORMATION");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRGETJOININFORMATION");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRGETJOININFORMATION");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRGETJOININFORMATION");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRGETJOININFORMATION");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRGETJOININFORMATION");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1431,17 +1431,17 @@ void ndr_print_WKS_NETRGETJOININFORMATION(struct ndr_print *ndr, const char *nam
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRGETJOINABLEOUS(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRGETJOINABLEOUS *r)
+void ndr_print_WKSSVC_NETRGETJOINABLEOUS(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRGETJOINABLEOUS *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRGETJOINABLEOUS");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRGETJOINABLEOUS");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRGETJOINABLEOUS");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRGETJOINABLEOUS");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRGETJOINABLEOUS");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRGETJOINABLEOUS");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1449,17 +1449,17 @@ void ndr_print_WKS_NETRGETJOINABLEOUS(struct ndr_print *ndr, const char *name, i
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRJOINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRJOINDOMAIN2 *r)
+void ndr_print_WKSSVC_NETRJOINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRJOINDOMAIN2 *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRJOINDOMAIN2");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRJOINDOMAIN2");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRJOINDOMAIN2");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRJOINDOMAIN2");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRJOINDOMAIN2");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRJOINDOMAIN2");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1467,17 +1467,17 @@ void ndr_print_WKS_NETRJOINDOMAIN2(struct ndr_print *ndr, const char *name, int
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRUNJOINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRUNJOINDOMAIN2 *r)
+void ndr_print_WKSSVC_NETRUNJOINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRUNJOINDOMAIN2 *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRUNJOINDOMAIN2");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRUNJOINDOMAIN2");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRUNJOINDOMAIN2");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRUNJOINDOMAIN2");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRUNJOINDOMAIN2");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRUNJOINDOMAIN2");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1485,17 +1485,17 @@ void ndr_print_WKS_NETRUNJOINDOMAIN2(struct ndr_print *ndr, const char *name, in
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRRENAMEMACHINEINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRRENAMEMACHINEINDOMAIN2 *r)
+void ndr_print_WKSSVC_NETRRENAMEMACHINEINDOMAIN2(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN2 *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRRENAMEMACHINEINDOMAIN2");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRRENAMEMACHINEINDOMAIN2");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRRENAMEMACHINEINDOMAIN2");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRRENAMEMACHINEINDOMAIN2");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRRENAMEMACHINEINDOMAIN2");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRRENAMEMACHINEINDOMAIN2");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1503,17 +1503,17 @@ void ndr_print_WKS_NETRRENAMEMACHINEINDOMAIN2(struct ndr_print *ndr, const char
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRVALIDATENAME2(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRVALIDATENAME2 *r)
+void ndr_print_WKSSVC_NETRVALIDATENAME2(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRVALIDATENAME2 *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRVALIDATENAME2");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRVALIDATENAME2");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRVALIDATENAME2");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRVALIDATENAME2");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRVALIDATENAME2");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRVALIDATENAME2");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1521,17 +1521,17 @@ void ndr_print_WKS_NETRVALIDATENAME2(struct ndr_print *ndr, const char *name, in
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRGETJOINABLEOUS2(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRGETJOINABLEOUS2 *r)
+void ndr_print_WKSSVC_NETRGETJOINABLEOUS2(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRGETJOINABLEOUS2 *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRGETJOINABLEOUS2");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRGETJOINABLEOUS2");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRGETJOINABLEOUS2");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRGETJOINABLEOUS2");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRGETJOINABLEOUS2");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRGETJOINABLEOUS2");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1539,17 +1539,17 @@ void ndr_print_WKS_NETRGETJOINABLEOUS2(struct ndr_print *ndr, const char *name,
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRADDALTERNATECOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRADDALTERNATECOMPUTERNAME *r)
+void ndr_print_WKSSVC_NETRADDALTERNATECOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRADDALTERNATECOMPUTERNAME *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRADDALTERNATECOMPUTERNAME");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRADDALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRADDALTERNATECOMPUTERNAME");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRADDALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRADDALTERNATECOMPUTERNAME");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRADDALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1557,17 +1557,17 @@ void ndr_print_WKS_NETRADDALTERNATECOMPUTERNAME(struct ndr_print *ndr, const cha
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRREMOVEALTERNATECOMPUTERNAME *r)
+void ndr_print_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRREMOVEALTERNATECOMPUTERNAME");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRREMOVEALTERNATECOMPUTERNAME");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRREMOVEALTERNATECOMPUTERNAME");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1575,17 +1575,17 @@ void ndr_print_WKS_NETRREMOVEALTERNATECOMPUTERNAME(struct ndr_print *ndr, const
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRSETPRIMARYCOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRSETPRIMARYCOMPUTERNAME *r)
+void ndr_print_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRSETPRIMARYCOMPUTERNAME *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRSETPRIMARYCOMPUTERNAME");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRSETPRIMARYCOMPUTERNAME");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRSETPRIMARYCOMPUTERNAME");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRSETPRIMARYCOMPUTERNAME");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRSETPRIMARYCOMPUTERNAME");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRSETPRIMARYCOMPUTERNAME");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
@@ -1593,17 +1593,17 @@ void ndr_print_WKS_NETRSETPRIMARYCOMPUTERNAME(struct ndr_print *ndr, const char
 	ndr->depth--;
 }
 
-void ndr_print_WKS_NETRENUMERATECOMPUTERNAMES(struct ndr_print *ndr, const char *name, int flags, struct WKS_NETRENUMERATECOMPUTERNAMES *r)
+void ndr_print_WKSSVC_NETRENUMERATECOMPUTERNAMES(struct ndr_print *ndr, const char *name, int flags, struct WKSSVC_NETRENUMERATECOMPUTERNAMES *r)
 {
-	ndr_print_struct(ndr, name, "WKS_NETRENUMERATECOMPUTERNAMES");
+	ndr_print_struct(ndr, name, "WKSSVC_NETRENUMERATECOMPUTERNAMES");
 	ndr->depth++;
 	if (flags & NDR_IN) {
-		ndr_print_struct(ndr, "in", "WKS_NETRENUMERATECOMPUTERNAMES");
+		ndr_print_struct(ndr, "in", "WKSSVC_NETRENUMERATECOMPUTERNAMES");
 	ndr->depth++;
 	ndr->depth--;
 	}
 	if (flags & NDR_OUT) {
-		ndr_print_struct(ndr, "out", "WKS_NETRENUMERATECOMPUTERNAMES");
+		ndr_print_struct(ndr, "out", "WKSSVC_NETRENUMERATECOMPUTERNAMES");
 	ndr->depth++;
 	ndr_print_WERROR(ndr, "result", &r->out.result);
 	ndr->depth--;
diff --git a/source4/librpc/ndr/ndr_wkssvc.h b/source4/librpc/ndr/ndr_wkssvc.h
index a9ebb34533..805903620b 100644
--- a/source4/librpc/ndr/ndr_wkssvc.h
+++ b/source4/librpc/ndr/ndr_wkssvc.h
@@ -4,40 +4,40 @@
 #define DCERPC_WKSSVC_VERSION 1.0
 #define DCERPC_WKSSVC_NAME "wkssvc"
 
-#define DCERPC_WKS_QUERYINFO 0
-#define DCERPC_WKS_SETINFO 1
-#define DCERPC_WKS_NETRWKSTAUSERENUM 2
-#define DCERPC_WKS_NETRWKSTAUSERGETINFO 3
-#define DCERPC_WKS_NETRWKSTAUSERSETINFO 4
-#define DCERPC_WKS_TRANSPORTENUM 5
-#define DCERPC_WKS_NETRWKSTATRANSPORTADD 6
-#define DCERPC_WKS_NETRWKSTATRANSPORTDEL 7
-#define DCERPC_WKS_NETRUSEADD 8
-#define DCERPC_WKS_NETRUSEGETINFO 9
-#define DCERPC_WKS_NETRUSEDEL 10
-#define DCERPC_WKS_NETRUSEENUM 11
-#define DCERPC_WKS_NETRMESSAGEBUFFERSEND 12
-#define DCERPC_WKS_NETRWORKSTATIONSTATISTICSGET 13
-#define DCERPC_WKS_NETRLOGONDOMAINNAMEADD 14
-#define DCERPC_WKS_NETRLOGONDOMAINNAMEDEL 15
-#define DCERPC_WKS_NETRJOINDOMAIN 16
-#define DCERPC_WKS_NETRUNJOINDOMAIN 17
-#define DCERPC_WKS_NETRRENAMEMACHINEINDOMAIN 18
-#define DCERPC_WKS_NETRVALIDATENAME 19
-#define DCERPC_WKS_NETRGETJOININFORMATION 20
-#define DCERPC_WKS_NETRGETJOINABLEOUS 21
-#define DCERPC_WKS_NETRJOINDOMAIN2 22
-#define DCERPC_WKS_NETRUNJOINDOMAIN2 23
-#define DCERPC_WKS_NETRRENAMEMACHINEINDOMAIN2 24
-#define DCERPC_WKS_NETRVALIDATENAME2 25
-#define DCERPC_WKS_NETRGETJOINABLEOUS2 26
-#define DCERPC_WKS_NETRADDALTERNATECOMPUTERNAME 27
-#define DCERPC_WKS_NETRREMOVEALTERNATECOMPUTERNAME 28
-#define DCERPC_WKS_NETRSETPRIMARYCOMPUTERNAME 29
-#define DCERPC_WKS_NETRENUMERATECOMPUTERNAMES 30
-
-
-struct wks_Info100 {
+#define DCERPC_WKSSVC_QUERYINFO 0
+#define DCERPC_WKSSVC_SETINFO 1
+#define DCERPC_WKSSVC_NETRWKSTAUSERENUM 2
+#define DCERPC_WKSSVC_NETRWKSTAUSERGETINFO 3
+#define DCERPC_WKSSVC_NETRWKSTAUSERSETINFO 4
+#define DCERPC_WKSSVC_TRANSPORTENUM 5
+#define DCERPC_WKSSVC_NETRWKSTATRANSPORTADD 6
+#define DCERPC_WKSSVC_NETRWKSTATRANSPORTDEL 7
+#define DCERPC_WKSSVC_NETRUSEADD 8
+#define DCERPC_WKSSVC_NETRUSEGETINFO 9
+#define DCERPC_WKSSVC_NETRUSEDEL 10
+#define DCERPC_WKSSVC_NETRUSEENUM 11
+#define DCERPC_WKSSVC_NETRMESSAGEBUFFERSEND 12
+#define DCERPC_WKSSVC_NETRWORKSTATIONSTATISTICSGET 13
+#define DCERPC_WKSSVC_NETRLOGONDOMAINNAMEADD 14
+#define DCERPC_WKSSVC_NETRLOGONDOMAINNAMEDEL 15
+#define DCERPC_WKSSVC_NETRJOINDOMAIN 16
+#define DCERPC_WKSSVC_NETRUNJOINDOMAIN 17
+#define DCERPC_WKSSVC_NETRRENAMEMACHINEINDOMAIN 18
+#define DCERPC_WKSSVC_NETRVALIDATENAME 19
+#define DCERPC_WKSSVC_NETRGETJOININFORMATION 20
+#define DCERPC_WKSSVC_NETRGETJOINABLEOUS 21
+#define DCERPC_WKSSVC_NETRJOINDOMAIN2 22
+#define DCERPC_WKSSVC_NETRUNJOINDOMAIN2 23
+#define DCERPC_WKSSVC_NETRRENAMEMACHINEINDOMAIN2 24
+#define DCERPC_WKSSVC_NETRVALIDATENAME2 25
+#define DCERPC_WKSSVC_NETRGETJOINABLEOUS2 26
+#define DCERPC_WKSSVC_NETRADDALTERNATECOMPUTERNAME 27
+#define DCERPC_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME 28
+#define DCERPC_WKSSVC_NETRSETPRIMARYCOMPUTERNAME 29
+#define DCERPC_WKSSVC_NETRENUMERATECOMPUTERNAMES 30
+
+
+struct wkssvc_Info100 {
 	uint32 platform_id;
 	const char *server;
 	const char *domain;
@@ -45,7 +45,7 @@ struct wks_Info100 {
 	uint32 ver_minor;
 };
 
-struct wks_Info101 {
+struct wkssvc_Info101 {
 	uint32 platform_id;
 	const char *server;
 	const char *domain;
@@ -54,7 +54,7 @@ struct wks_Info101 {
 	const char *lan_root;
 };
 
-struct wks_Info102 {
+struct wkssvc_Info102 {
 	uint32 platform_id;
 	const char *server;
 	const char *domain;
@@ -64,26 +64,26 @@ struct wks_Info102 {
 	uint32 logged_on_users;
 };
 
-union wks_Info {
-/* [case(100)] */ struct wks_Info100 *info100;
-/* [case(101)] */ struct wks_Info101 *info101;
-/* [case(102)] */ struct wks_Info102 *info102;
+union wkssvc_Info {
+/* [case(100)] */ struct wkssvc_Info100 *info100;
+/* [case(101)] */ struct wkssvc_Info101 *info101;
+/* [case(102)] */ struct wkssvc_Info102 *info102;
 };
 
-struct wks_QueryInfo {
+struct wkssvc_QueryInfo {
 	struct {
 		const char *server_name;
 		uint32 level;
 	} in;
 
 	struct {
-		union wks_Info info;
+		union wkssvc_Info info;
 		WERROR result;
 	} out;
 
 };
 
-struct wks_SetInfo {
+struct wkssvc_SetInfo {
 	struct {
 	} in;
 
@@ -93,7 +93,7 @@ struct wks_SetInfo {
 
 };
 
-struct WKS_NETRWKSTAUSERENUM {
+struct WKSSVC_NETRWKSTAUSERENUM {
 	struct {
 	} in;
 
@@ -103,7 +103,7 @@ struct WKS_NETRWKSTAUSERENUM {
 
 };
 
-struct WKS_NETRWKSTAUSERGETINFO {
+struct WKSSVC_NETRWKSTAUSERGETINFO {
 	struct {
 	} in;
 
@@ -113,7 +113,7 @@ struct WKS_NETRWKSTAUSERGETINFO {
 
 };
 
-struct WKS_NETRWKSTAUSERSETINFO {
+struct WKSSVC_NETRWKSTAUSERSETINFO {
 	struct {
 	} in;
 
@@ -123,7 +123,7 @@ struct WKS_NETRWKSTAUSERSETINFO {
 
 };
 
-struct wks_TransportInfo0 {
+struct wkssvc_TransportInfo0 {
 	uint32 quality_of_service;
 	uint32 vc_count;
 	const char *name;
@@ -131,30 +131,30 @@ struct wks_TransportInfo0 {
 	uint32 wan_link;
 };
 
-struct wks_TransportInfoArray {
+struct wkssvc_TransportInfoArray {
 	uint32 count;
-	struct wks_TransportInfo0 *transports;
+	struct wkssvc_TransportInfo0 *transports;
 };
 
-union wks_TransportUnion {
-/* [case(0)] */ struct wks_TransportInfoArray *array;
+union wkssvc_TransportUnion {
+/* [case(0)] */ struct wkssvc_TransportInfoArray *array;
 };
 
-struct wks_TransportInfo {
+struct wkssvc_TransportInfo {
 	uint32 level;
-	union wks_TransportUnion u;
+	union wkssvc_TransportUnion u;
 };
 
-struct wks_TransportEnum {
+struct wkssvc_TransportEnum {
 	struct {
 		const char *server_name;
-		struct wks_TransportInfo *info;
+		struct wkssvc_TransportInfo *info;
 		uint32 max_buffer;
 		uint32 *resume_handle;
 	} in;
 
 	struct {
-		struct wks_TransportInfo *info;
+		struct wkssvc_TransportInfo *info;
 		uint32 unknown;
 		uint32 *resume_handle;
 		WERROR result;
@@ -162,7 +162,7 @@ struct wks_TransportEnum {
 
 };
 
-struct WKS_NETRWKSTATRANSPORTADD {
+struct WKSSVC_NETRWKSTATRANSPORTADD {
 	struct {
 	} in;
 
@@ -172,7 +172,7 @@ struct WKS_NETRWKSTATRANSPORTADD {
 
 };
 
-struct WKS_NETRWKSTATRANSPORTDEL {
+struct WKSSVC_NETRWKSTATRANSPORTDEL {
 	struct {
 	} in;
 
@@ -182,7 +182,7 @@ struct WKS_NETRWKSTATRANSPORTDEL {
 
 };
 
-struct WKS_NETRUSEADD {
+struct WKSSVC_NETRUSEADD {
 	struct {
 	} in;
 
@@ -192,7 +192,7 @@ struct WKS_NETRUSEADD {
 
 };
 
-struct WKS_NETRUSEGETINFO {
+struct WKSSVC_NETRUSEGETINFO {
 	struct {
 	} in;
 
@@ -202,7 +202,7 @@ struct WKS_NETRUSEGETINFO {
 
 };
 
-struct WKS_NETRUSEDEL {
+struct WKSSVC_NETRUSEDEL {
 	struct {
 	} in;
 
@@ -212,7 +212,7 @@ struct WKS_NETRUSEDEL {
 
 };
 
-struct WKS_NETRUSEENUM {
+struct WKSSVC_NETRUSEENUM {
 	struct {
 	} in;
 
@@ -222,7 +222,7 @@ struct WKS_NETRUSEENUM {
 
 };
 
-struct WKS_NETRMESSAGEBUFFERSEND {
+struct WKSSVC_NETRMESSAGEBUFFERSEND {
 	struct {
 	} in;
 
@@ -232,7 +232,7 @@ struct WKS_NETRMESSAGEBUFFERSEND {
 
 };
 
-struct WKS_NETRWORKSTATIONSTATISTICSGET {
+struct WKSSVC_NETRWORKSTATIONSTATISTICSGET {
 	struct {
 	} in;
 
@@ -242,7 +242,7 @@ struct WKS_NETRWORKSTATIONSTATISTICSGET {
 
 };
 
-struct WKS_NETRLOGONDOMAINNAMEADD {
+struct WKSSVC_NETRLOGONDOMAINNAMEADD {
 	struct {
 	} in;
 
@@ -252,7 +252,7 @@ struct WKS_NETRLOGONDOMAINNAMEADD {
 
 };
 
-struct WKS_NETRLOGONDOMAINNAMEDEL {
+struct WKSSVC_NETRLOGONDOMAINNAMEDEL {
 	struct {
 	} in;
 
@@ -262,7 +262,7 @@ struct WKS_NETRLOGONDOMAINNAMEDEL {
 
 };
 
-struct WKS_NETRJOINDOMAIN {
+struct WKSSVC_NETRJOINDOMAIN {
 	struct {
 	} in;
 
@@ -272,7 +272,7 @@ struct WKS_NETRJOINDOMAIN {
 
 };
 
-struct WKS_NETRUNJOINDOMAIN {
+struct WKSSVC_NETRUNJOINDOMAIN {
 	struct {
 	} in;
 
@@ -282,7 +282,7 @@ struct WKS_NETRUNJOINDOMAIN {
 
 };
 
-struct WKS_NETRRENAMEMACHINEINDOMAIN {
+struct WKSSVC_NETRRENAMEMACHINEINDOMAIN {
 	struct {
 	} in;
 
@@ -292,7 +292,7 @@ struct WKS_NETRRENAMEMACHINEINDOMAIN {
 
 };
 
-struct WKS_NETRVALIDATENAME {
+struct WKSSVC_NETRVALIDATENAME {
 	struct {
 	} in;
 
@@ -302,7 +302,7 @@ struct WKS_NETRVALIDATENAME {
 
 };
 
-struct WKS_NETRGETJOININFORMATION {
+struct WKSSVC_NETRGETJOININFORMATION {
 	struct {
 	} in;
 
@@ -312,7 +312,7 @@ struct WKS_NETRGETJOININFORMATION {
 
 };
 
-struct WKS_NETRGETJOINABLEOUS {
+struct WKSSVC_NETRGETJOINABLEOUS {
 	struct {
 	} in;
 
@@ -322,7 +322,7 @@ struct WKS_NETRGETJOINABLEOUS {
 
 };
 
-struct WKS_NETRJOINDOMAIN2 {
+struct WKSSVC_NETRJOINDOMAIN2 {
 	struct {
 	} in;
 
@@ -332,7 +332,7 @@ struct WKS_NETRJOINDOMAIN2 {
 
 };
 
-struct WKS_NETRUNJOINDOMAIN2 {
+struct WKSSVC_NETRUNJOINDOMAIN2 {
 	struct {
 	} in;
 
@@ -342,7 +342,7 @@ struct WKS_NETRUNJOINDOMAIN2 {
 
 };
 
-struct WKS_NETRRENAMEMACHINEINDOMAIN2 {
+struct WKSSVC_NETRRENAMEMACHINEINDOMAIN2 {
 	struct {
 	} in;
 
@@ -352,7 +352,7 @@ struct WKS_NETRRENAMEMACHINEINDOMAIN2 {
 
 };
 
-struct WKS_NETRVALIDATENAME2 {
+struct WKSSVC_NETRVALIDATENAME2 {
 	struct {
 	} in;
 
@@ -362,7 +362,7 @@ struct WKS_NETRVALIDATENAME2 {
 
 };
 
-struct WKS_NETRGETJOINABLEOUS2 {
+struct WKSSVC_NETRGETJOINABLEOUS2 {
 	struct {
 	} in;
 
@@ -372,7 +372,7 @@ struct WKS_NETRGETJOINABLEOUS2 {
 
 };
 
-struct WKS_NETRADDALTERNATECOMPUTERNAME {
+struct WKSSVC_NETRADDALTERNATECOMPUTERNAME {
 	struct {
 	} in;
 
@@ -382,7 +382,7 @@ struct WKS_NETRADDALTERNATECOMPUTERNAME {
 
 };
 
-struct WKS_NETRREMOVEALTERNATECOMPUTERNAME {
+struct WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME {
 	struct {
 	} in;
 
@@ -392,7 +392,7 @@ struct WKS_NETRREMOVEALTERNATECOMPUTERNAME {
 
 };
 
-struct WKS_NETRSETPRIMARYCOMPUTERNAME {
+struct WKSSVC_NETRSETPRIMARYCOMPUTERNAME {
 	struct {
 	} in;
 
@@ -402,7 +402,7 @@ struct WKS_NETRSETPRIMARYCOMPUTERNAME {
 
 };
 
-struct WKS_NETRENUMERATECOMPUTERNAMES {
+struct WKSSVC_NETRENUMERATECOMPUTERNAMES {
 	struct {
 	} in;
 
diff --git a/source4/librpc/rpc/rpc_samr.c b/source4/librpc/rpc/rpc_samr.c
index 4ae1977c78..a35b6a136f 100644
--- a/source4/librpc/rpc/rpc_samr.c
+++ b/source4/librpc/rpc/rpc_samr.c
@@ -255,21 +255,21 @@ NTSTATUS dcerpc_samr_EnumDomainGroups(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx
 	return status;
 }
 
-NTSTATUS dcerpc_samr_CREATE_USER_IN_DOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CREATE_USER_IN_DOMAIN *r)
+NTSTATUS dcerpc_samr_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_CreateUser *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(samr_CREATE_USER_IN_DOMAIN, r);		
+		NDR_PRINT_IN_DEBUG(samr_CreateUser, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATE_USER_IN_DOMAIN, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_samr_CREATE_USER_IN_DOMAIN,
-				    (ndr_pull_fn_t) ndr_pull_samr_CREATE_USER_IN_DOMAIN,
+	status = dcerpc_ndr_request(p, DCERPC_SAMR_CREATEUSER, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_samr_CreateUser,
+				    (ndr_pull_fn_t) ndr_pull_samr_CreateUser,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(samr_CREATE_USER_IN_DOMAIN, r);		
+		NDR_PRINT_OUT_DEBUG(samr_CreateUser, r);		
 	}
 	if (NT_STATUS_IS_OK(status)) status = r->out.result;
 
@@ -339,21 +339,21 @@ NTSTATUS dcerpc_samr_EnumDomainAliases(struct dcerpc_pipe *p, TALLOC_CTX *mem_ct
 	return status;
 }
 
-NTSTATUS dcerpc_samr_GET_ALIAS_MEMBERSHIP(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GET_ALIAS_MEMBERSHIP *r)
+NTSTATUS dcerpc_samr_GetAliasMembership(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_GetAliasMembership *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(samr_GET_ALIAS_MEMBERSHIP, r);		
+		NDR_PRINT_IN_DEBUG(samr_GetAliasMembership, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_SAMR_GET_ALIAS_MEMBERSHIP, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_samr_GET_ALIAS_MEMBERSHIP,
-				    (ndr_pull_fn_t) ndr_pull_samr_GET_ALIAS_MEMBERSHIP,
+	status = dcerpc_ndr_request(p, DCERPC_SAMR_GETALIASMEMBERSHIP, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_samr_GetAliasMembership,
+				    (ndr_pull_fn_t) ndr_pull_samr_GetAliasMembership,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(samr_GET_ALIAS_MEMBERSHIP, r);		
+		NDR_PRINT_OUT_DEBUG(samr_GetAliasMembership, r);		
 	}
 	if (NT_STATUS_IS_OK(status)) status = r->out.result;
 
@@ -738,21 +738,21 @@ NTSTATUS dcerpc_samr_OpenUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct
 	return status;
 }
 
-NTSTATUS dcerpc_samr_DELETE_DOM_USER(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DELETE_DOM_USER *r)
+NTSTATUS dcerpc_samr_DeleteUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_DeleteUser *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(samr_DELETE_DOM_USER, r);		
+		NDR_PRINT_IN_DEBUG(samr_DeleteUser, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_SAMR_DELETE_DOM_USER, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_samr_DELETE_DOM_USER,
-				    (ndr_pull_fn_t) ndr_pull_samr_DELETE_DOM_USER,
+	status = dcerpc_ndr_request(p, DCERPC_SAMR_DELETEUSER, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_samr_DeleteUser,
+				    (ndr_pull_fn_t) ndr_pull_samr_DeleteUser,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(samr_DELETE_DOM_USER, r);		
+		NDR_PRINT_OUT_DEBUG(samr_DeleteUser, r);		
 	}
 	if (NT_STATUS_IS_OK(status)) status = r->out.result;
 
diff --git a/source4/librpc/rpc/rpc_wkssvc.c b/source4/librpc/rpc/rpc_wkssvc.c
index 3a591c52ad..d348dd7ca3 100644
--- a/source4/librpc/rpc/rpc_wkssvc.c
+++ b/source4/librpc/rpc/rpc_wkssvc.c
@@ -3,621 +3,621 @@
 #include "includes.h"
 
 
-NTSTATUS dcerpc_wks_QueryInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wks_QueryInfo *r)
+NTSTATUS dcerpc_wkssvc_QueryInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wkssvc_QueryInfo *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(wks_QueryInfo, r);		
+		NDR_PRINT_IN_DEBUG(wkssvc_QueryInfo, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_QUERYINFO, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_wks_QueryInfo,
-				    (ndr_pull_fn_t) ndr_pull_wks_QueryInfo,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_QUERYINFO, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_wkssvc_QueryInfo,
+				    (ndr_pull_fn_t) ndr_pull_wkssvc_QueryInfo,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(wks_QueryInfo, r);		
+		NDR_PRINT_OUT_DEBUG(wkssvc_QueryInfo, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_wks_SetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wks_SetInfo *r)
+NTSTATUS dcerpc_wkssvc_SetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wkssvc_SetInfo *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(wks_SetInfo, r);		
+		NDR_PRINT_IN_DEBUG(wkssvc_SetInfo, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_SETINFO, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_wks_SetInfo,
-				    (ndr_pull_fn_t) ndr_pull_wks_SetInfo,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_SETINFO, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_wkssvc_SetInfo,
+				    (ndr_pull_fn_t) ndr_pull_wkssvc_SetInfo,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(wks_SetInfo, r);		
+		NDR_PRINT_OUT_DEBUG(wkssvc_SetInfo, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWKSTAUSERENUM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWKSTAUSERENUM *r)
+NTSTATUS dcerpc_WKSSVC_NETRWKSTAUSERENUM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWKSTAUSERENUM *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWKSTAUSERENUM, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWKSTAUSERENUM, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWKSTAUSERENUM, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWKSTAUSERENUM,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWKSTAUSERENUM,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWKSTAUSERENUM, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWKSTAUSERENUM,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWKSTAUSERENUM,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWKSTAUSERENUM, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWKSTAUSERENUM, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWKSTAUSERGETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWKSTAUSERGETINFO *r)
+NTSTATUS dcerpc_WKSSVC_NETRWKSTAUSERGETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWKSTAUSERGETINFO *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWKSTAUSERGETINFO, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWKSTAUSERGETINFO, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWKSTAUSERGETINFO, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWKSTAUSERGETINFO,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWKSTAUSERGETINFO,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWKSTAUSERGETINFO, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWKSTAUSERGETINFO,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWKSTAUSERGETINFO,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWKSTAUSERGETINFO, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWKSTAUSERGETINFO, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWKSTAUSERSETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWKSTAUSERSETINFO *r)
+NTSTATUS dcerpc_WKSSVC_NETRWKSTAUSERSETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWKSTAUSERSETINFO *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWKSTAUSERSETINFO, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWKSTAUSERSETINFO, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWKSTAUSERSETINFO, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWKSTAUSERSETINFO,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWKSTAUSERSETINFO,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWKSTAUSERSETINFO, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWKSTAUSERSETINFO,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWKSTAUSERSETINFO,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWKSTAUSERSETINFO, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWKSTAUSERSETINFO, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_wks_TransportEnum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wks_TransportEnum *r)
+NTSTATUS dcerpc_wkssvc_TransportEnum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct wkssvc_TransportEnum *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(wks_TransportEnum, r);		
+		NDR_PRINT_IN_DEBUG(wkssvc_TransportEnum, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_TRANSPORTENUM, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_wks_TransportEnum,
-				    (ndr_pull_fn_t) ndr_pull_wks_TransportEnum,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_TRANSPORTENUM, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_wkssvc_TransportEnum,
+				    (ndr_pull_fn_t) ndr_pull_wkssvc_TransportEnum,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(wks_TransportEnum, r);		
+		NDR_PRINT_OUT_DEBUG(wkssvc_TransportEnum, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWKSTATRANSPORTADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWKSTATRANSPORTADD *r)
+NTSTATUS dcerpc_WKSSVC_NETRWKSTATRANSPORTADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWKSTATRANSPORTADD *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWKSTATRANSPORTADD, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWKSTATRANSPORTADD, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWKSTATRANSPORTADD, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWKSTATRANSPORTADD,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWKSTATRANSPORTADD,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWKSTATRANSPORTADD, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWKSTATRANSPORTADD,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWKSTATRANSPORTADD,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWKSTATRANSPORTADD, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWKSTATRANSPORTADD, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWKSTATRANSPORTDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWKSTATRANSPORTDEL *r)
+NTSTATUS dcerpc_WKSSVC_NETRWKSTATRANSPORTDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWKSTATRANSPORTDEL *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWKSTATRANSPORTDEL, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWKSTATRANSPORTDEL, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWKSTATRANSPORTDEL, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWKSTATRANSPORTDEL,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWKSTATRANSPORTDEL,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWKSTATRANSPORTDEL, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWKSTATRANSPORTDEL,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWKSTATRANSPORTDEL,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWKSTATRANSPORTDEL, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWKSTATRANSPORTDEL, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUSEADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUSEADD *r)
+NTSTATUS dcerpc_WKSSVC_NETRUSEADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUSEADD *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUSEADD, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUSEADD, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUSEADD, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUSEADD,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUSEADD,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUSEADD, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUSEADD,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUSEADD,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUSEADD, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUSEADD, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUSEGETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUSEGETINFO *r)
+NTSTATUS dcerpc_WKSSVC_NETRUSEGETINFO(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUSEGETINFO *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUSEGETINFO, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUSEGETINFO, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUSEGETINFO, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUSEGETINFO,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUSEGETINFO,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUSEGETINFO, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUSEGETINFO,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUSEGETINFO,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUSEGETINFO, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUSEGETINFO, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUSEDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUSEDEL *r)
+NTSTATUS dcerpc_WKSSVC_NETRUSEDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUSEDEL *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUSEDEL, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUSEDEL, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUSEDEL, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUSEDEL,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUSEDEL,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUSEDEL, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUSEDEL,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUSEDEL,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUSEDEL, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUSEDEL, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUSEENUM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUSEENUM *r)
+NTSTATUS dcerpc_WKSSVC_NETRUSEENUM(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUSEENUM *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUSEENUM, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUSEENUM, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUSEENUM, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUSEENUM,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUSEENUM,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUSEENUM, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUSEENUM,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUSEENUM,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUSEENUM, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUSEENUM, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRMESSAGEBUFFERSEND(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRMESSAGEBUFFERSEND *r)
+NTSTATUS dcerpc_WKSSVC_NETRMESSAGEBUFFERSEND(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRMESSAGEBUFFERSEND *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRMESSAGEBUFFERSEND, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRMESSAGEBUFFERSEND, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRMESSAGEBUFFERSEND, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRMESSAGEBUFFERSEND,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRMESSAGEBUFFERSEND,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRMESSAGEBUFFERSEND, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRMESSAGEBUFFERSEND,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRMESSAGEBUFFERSEND,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRMESSAGEBUFFERSEND, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRMESSAGEBUFFERSEND, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRWORKSTATIONSTATISTICSGET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRWORKSTATIONSTATISTICSGET *r)
+NTSTATUS dcerpc_WKSSVC_NETRWORKSTATIONSTATISTICSGET(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRWORKSTATIONSTATISTICSGET *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRWORKSTATIONSTATISTICSGET, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRWORKSTATIONSTATISTICSGET, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRWORKSTATIONSTATISTICSGET, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRWORKSTATIONSTATISTICSGET,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRWORKSTATIONSTATISTICSGET,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRWORKSTATIONSTATISTICSGET, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRWORKSTATIONSTATISTICSGET,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRWORKSTATIONSTATISTICSGET,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRWORKSTATIONSTATISTICSGET, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRWORKSTATIONSTATISTICSGET, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRLOGONDOMAINNAMEADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRLOGONDOMAINNAMEADD *r)
+NTSTATUS dcerpc_WKSSVC_NETRLOGONDOMAINNAMEADD(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRLOGONDOMAINNAMEADD *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRLOGONDOMAINNAMEADD, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRLOGONDOMAINNAMEADD, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRLOGONDOMAINNAMEADD, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRLOGONDOMAINNAMEADD,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRLOGONDOMAINNAMEADD,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRLOGONDOMAINNAMEADD, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRLOGONDOMAINNAMEADD,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRLOGONDOMAINNAMEADD,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRLOGONDOMAINNAMEADD, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRLOGONDOMAINNAMEADD, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRLOGONDOMAINNAMEDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRLOGONDOMAINNAMEDEL *r)
+NTSTATUS dcerpc_WKSSVC_NETRLOGONDOMAINNAMEDEL(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRLOGONDOMAINNAMEDEL *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRLOGONDOMAINNAMEDEL, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRLOGONDOMAINNAMEDEL, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRLOGONDOMAINNAMEDEL, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRLOGONDOMAINNAMEDEL,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRLOGONDOMAINNAMEDEL,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRLOGONDOMAINNAMEDEL, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRLOGONDOMAINNAMEDEL,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRLOGONDOMAINNAMEDEL,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRLOGONDOMAINNAMEDEL, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRLOGONDOMAINNAMEDEL, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRJOINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRJOINDOMAIN *r)
+NTSTATUS dcerpc_WKSSVC_NETRJOINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRJOINDOMAIN *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRJOINDOMAIN, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRJOINDOMAIN, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRJOINDOMAIN, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRJOINDOMAIN,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRJOINDOMAIN,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRJOINDOMAIN, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRJOINDOMAIN,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRJOINDOMAIN,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRJOINDOMAIN, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRJOINDOMAIN, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUNJOINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUNJOINDOMAIN *r)
+NTSTATUS dcerpc_WKSSVC_NETRUNJOINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUNJOINDOMAIN *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUNJOINDOMAIN, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUNJOINDOMAIN, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUNJOINDOMAIN, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUNJOINDOMAIN,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUNJOINDOMAIN,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUNJOINDOMAIN, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUNJOINDOMAIN,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUNJOINDOMAIN,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUNJOINDOMAIN, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUNJOINDOMAIN, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRRENAMEMACHINEINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRRENAMEMACHINEINDOMAIN *r)
+NTSTATUS dcerpc_WKSSVC_NETRRENAMEMACHINEINDOMAIN(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRRENAMEMACHINEINDOMAIN, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRRENAMEMACHINEINDOMAIN, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRRENAMEMACHINEINDOMAIN, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRRENAMEMACHINEINDOMAIN,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRRENAMEMACHINEINDOMAIN,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRRENAMEMACHINEINDOMAIN, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRRENAMEMACHINEINDOMAIN,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRRENAMEMACHINEINDOMAIN,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRRENAMEMACHINEINDOMAIN, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRRENAMEMACHINEINDOMAIN, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRVALIDATENAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRVALIDATENAME *r)
+NTSTATUS dcerpc_WKSSVC_NETRVALIDATENAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRVALIDATENAME *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRVALIDATENAME, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRVALIDATENAME, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRVALIDATENAME, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRVALIDATENAME,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRVALIDATENAME,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRVALIDATENAME, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRVALIDATENAME,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRVALIDATENAME,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRVALIDATENAME, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRVALIDATENAME, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRGETJOININFORMATION(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRGETJOININFORMATION *r)
+NTSTATUS dcerpc_WKSSVC_NETRGETJOININFORMATION(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRGETJOININFORMATION *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRGETJOININFORMATION, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRGETJOININFORMATION, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRGETJOININFORMATION, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRGETJOININFORMATION,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRGETJOININFORMATION,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRGETJOININFORMATION, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRGETJOININFORMATION,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRGETJOININFORMATION,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRGETJOININFORMATION, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRGETJOININFORMATION, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRGETJOINABLEOUS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRGETJOINABLEOUS *r)
+NTSTATUS dcerpc_WKSSVC_NETRGETJOINABLEOUS(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRGETJOINABLEOUS *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRGETJOINABLEOUS, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRGETJOINABLEOUS, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRGETJOINABLEOUS, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRGETJOINABLEOUS,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRGETJOINABLEOUS,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRGETJOINABLEOUS, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRGETJOINABLEOUS,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRGETJOINABLEOUS,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRGETJOINABLEOUS, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRGETJOINABLEOUS, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRJOINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRJOINDOMAIN2 *r)
+NTSTATUS dcerpc_WKSSVC_NETRJOINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRJOINDOMAIN2 *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRJOINDOMAIN2, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRJOINDOMAIN2, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRJOINDOMAIN2, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRJOINDOMAIN2,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRJOINDOMAIN2,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRJOINDOMAIN2, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRJOINDOMAIN2,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRJOINDOMAIN2,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRJOINDOMAIN2, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRJOINDOMAIN2, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRUNJOINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRUNJOINDOMAIN2 *r)
+NTSTATUS dcerpc_WKSSVC_NETRUNJOINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRUNJOINDOMAIN2 *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRUNJOINDOMAIN2, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRUNJOINDOMAIN2, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRUNJOINDOMAIN2, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRUNJOINDOMAIN2,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRUNJOINDOMAIN2,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRUNJOINDOMAIN2, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRUNJOINDOMAIN2,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRUNJOINDOMAIN2,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRUNJOINDOMAIN2, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRUNJOINDOMAIN2, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRRENAMEMACHINEINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRRENAMEMACHINEINDOMAIN2 *r)
+NTSTATUS dcerpc_WKSSVC_NETRRENAMEMACHINEINDOMAIN2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRRENAMEMACHINEINDOMAIN2 *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRRENAMEMACHINEINDOMAIN2, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRRENAMEMACHINEINDOMAIN2, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRRENAMEMACHINEINDOMAIN2, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRRENAMEMACHINEINDOMAIN2,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRRENAMEMACHINEINDOMAIN2,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRRENAMEMACHINEINDOMAIN2, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRRENAMEMACHINEINDOMAIN2,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRRENAMEMACHINEINDOMAIN2,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRRENAMEMACHINEINDOMAIN2, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRRENAMEMACHINEINDOMAIN2, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRVALIDATENAME2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRVALIDATENAME2 *r)
+NTSTATUS dcerpc_WKSSVC_NETRVALIDATENAME2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRVALIDATENAME2 *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRVALIDATENAME2, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRVALIDATENAME2, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRVALIDATENAME2, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRVALIDATENAME2,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRVALIDATENAME2,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRVALIDATENAME2, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRVALIDATENAME2,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRVALIDATENAME2,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRVALIDATENAME2, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRVALIDATENAME2, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRGETJOINABLEOUS2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRGETJOINABLEOUS2 *r)
+NTSTATUS dcerpc_WKSSVC_NETRGETJOINABLEOUS2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRGETJOINABLEOUS2 *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRGETJOINABLEOUS2, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRGETJOINABLEOUS2, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRGETJOINABLEOUS2, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRGETJOINABLEOUS2,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRGETJOINABLEOUS2,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRGETJOINABLEOUS2, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRGETJOINABLEOUS2,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRGETJOINABLEOUS2,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRGETJOINABLEOUS2, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRGETJOINABLEOUS2, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRADDALTERNATECOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRADDALTERNATECOMPUTERNAME *r)
+NTSTATUS dcerpc_WKSSVC_NETRADDALTERNATECOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRADDALTERNATECOMPUTERNAME *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRADDALTERNATECOMPUTERNAME, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRADDALTERNATECOMPUTERNAME, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRADDALTERNATECOMPUTERNAME, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRADDALTERNATECOMPUTERNAME,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRADDALTERNATECOMPUTERNAME,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRADDALTERNATECOMPUTERNAME, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRADDALTERNATECOMPUTERNAME,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRADDALTERNATECOMPUTERNAME,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRADDALTERNATECOMPUTERNAME, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRADDALTERNATECOMPUTERNAME, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRREMOVEALTERNATECOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRREMOVEALTERNATECOMPUTERNAME *r)
+NTSTATUS dcerpc_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRREMOVEALTERNATECOMPUTERNAME, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRREMOVEALTERNATECOMPUTERNAME, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRREMOVEALTERNATECOMPUTERNAME,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRREMOVEALTERNATECOMPUTERNAME,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRREMOVEALTERNATECOMPUTERNAME, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRREMOVEALTERNATECOMPUTERNAME, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRSETPRIMARYCOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRSETPRIMARYCOMPUTERNAME *r)
+NTSTATUS dcerpc_WKSSVC_NETRSETPRIMARYCOMPUTERNAME(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRSETPRIMARYCOMPUTERNAME *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRSETPRIMARYCOMPUTERNAME, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRSETPRIMARYCOMPUTERNAME, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRSETPRIMARYCOMPUTERNAME, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRSETPRIMARYCOMPUTERNAME,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRSETPRIMARYCOMPUTERNAME,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRSETPRIMARYCOMPUTERNAME, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRSETPRIMARYCOMPUTERNAME,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRSETPRIMARYCOMPUTERNAME,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRSETPRIMARYCOMPUTERNAME, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRSETPRIMARYCOMPUTERNAME, r);		
 	}
 
 	return status;
 }
 
-NTSTATUS dcerpc_WKS_NETRENUMERATECOMPUTERNAMES(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKS_NETRENUMERATECOMPUTERNAMES *r)
+NTSTATUS dcerpc_WKSSVC_NETRENUMERATECOMPUTERNAMES(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct WKSSVC_NETRENUMERATECOMPUTERNAMES *r)
 {
 	NTSTATUS status;
 
         if (p->flags & DCERPC_DEBUG_PRINT_IN) {
-		NDR_PRINT_IN_DEBUG(WKS_NETRENUMERATECOMPUTERNAMES, r);		
+		NDR_PRINT_IN_DEBUG(WKSSVC_NETRENUMERATECOMPUTERNAMES, r);		
 	}
 
-	status = dcerpc_ndr_request(p, DCERPC_WKS_NETRENUMERATECOMPUTERNAMES, mem_ctx,
-				    (ndr_push_fn_t) ndr_push_WKS_NETRENUMERATECOMPUTERNAMES,
-				    (ndr_pull_fn_t) ndr_pull_WKS_NETRENUMERATECOMPUTERNAMES,
+	status = dcerpc_ndr_request(p, DCERPC_WKSSVC_NETRENUMERATECOMPUTERNAMES, mem_ctx,
+				    (ndr_push_fn_t) ndr_push_WKSSVC_NETRENUMERATECOMPUTERNAMES,
+				    (ndr_pull_fn_t) ndr_pull_WKSSVC_NETRENUMERATECOMPUTERNAMES,
 				    r);
 
         if (NT_STATUS_IS_OK(status) && (p->flags & DCERPC_DEBUG_PRINT_OUT)) {
-		NDR_PRINT_OUT_DEBUG(WKS_NETRENUMERATECOMPUTERNAMES, r);		
+		NDR_PRINT_OUT_DEBUG(WKSSVC_NETRENUMERATECOMPUTERNAMES, r);		
 	}
 
 	return status;
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 346a073723..79f64005be 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -400,6 +400,12 @@ static BOOL test_OpenDomain(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		return False;
 	}
 
+#if 0
+	if (!test_CreateUser(p, mem_ctx, &domain_handle)) {
+		ret = False;
+	}
+#endif
+
 	if (!test_QuerySecurity(p, mem_ctx, &domain_handle)) {
 		ret = False;
 	}
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 5f8a63de10..b8ae3de202 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -26,7 +26,7 @@ static BOOL test_QueryInfo(struct dcerpc_pipe *p,
 			   TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
-	struct wks_QueryInfo r;
+	struct wkssvc_QueryInfo r;
 	uint16 levels[] = {100, 101, 102};
 	int i;
 	BOOL ret = True;
@@ -36,7 +36,7 @@ static BOOL test_QueryInfo(struct dcerpc_pipe *p,
 	for (i=0;i<ARRAY_SIZE(levels);i++) {
 		r.in.level = levels[i];
 		printf("testing QueryInfo level %u\n", r.in.level);
-		status = dcerpc_wks_QueryInfo(p, mem_ctx, &r);
+		status = dcerpc_wkssvc_QueryInfo(p, mem_ctx, &r);
 		if (!NT_STATUS_IS_OK(status)) {
 			printf("QueryInfo level %u failed - %s\n", r.in.level, nt_errstr(status));
 			ret = False;
@@ -51,11 +51,11 @@ static BOOL test_TransportEnum(struct dcerpc_pipe *p,
 			       TALLOC_CTX *mem_ctx)
 {
 	NTSTATUS status;
-	struct wks_TransportEnum r;
+	struct wkssvc_TransportEnum r;
 	BOOL ret = True;
-	struct wks_TransportInfo info;
+	struct wkssvc_TransportInfo info;
 	uint32 resume_handle = 0;
-	struct wks_TransportInfoArray info_array;
+	struct wkssvc_TransportInfoArray info_array;
 
 	ZERO_STRUCT(info);
 	ZERO_STRUCT(info_array);
@@ -70,7 +70,7 @@ static BOOL test_TransportEnum(struct dcerpc_pipe *p,
 	r.out.resume_handle = &resume_handle;
 
 	printf("testing TransportEnum\n");
-	status = dcerpc_wks_TransportEnum(p, mem_ctx, &r);
+	status = dcerpc_wkssvc_TransportEnum(p, mem_ctx, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("TransportEnum failed - %s\n", nt_errstr(status));
 		ret = False;