diff --git a/packet-dcerpc-lsa.c b/packet-dcerpc-lsa.c
index cbfa4453be..1f1256580e 100644
--- a/packet-dcerpc-lsa.c
+++ b/packet-dcerpc-lsa.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *  2002  Added LSA command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-lsa.c,v 1.89 2003/09/03 09:48:50 sahlberg Exp $
+ * $Id: packet-dcerpc-lsa.c,v 1.90 2003/09/23 12:06:19 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -513,7 +513,7 @@ lsa_dissect_LSA_OBJECT_ATTRIBUTES(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaclose_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclose_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -523,7 +523,7 @@ lsa_dissect_lsaclose_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaclose_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclose_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -548,7 +548,7 @@ static int dissect_lsa_openpolicy_server(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopenpolicy_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenpolicy_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -566,7 +566,7 @@ lsa_dissect_lsaopenpolicy_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopenpolicy_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenpolicy_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	e_ctx_hnd policy_hnd;
@@ -591,7 +591,7 @@ lsa_dissect_lsaopenpolicy_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopenpolicy2_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenpolicy2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer_cb(tvb, offset, pinfo, tree, drep,
@@ -611,7 +611,7 @@ lsa_dissect_lsaopenpolicy2_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopenpolicy2_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenpolicy2_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	dcerpc_info *di = (dcerpc_info *)pinfo->private_data;
@@ -662,7 +662,7 @@ static const value_string policy_information_class_vals[] = {
 };
 
 static int
-lsa_dissect_lsaqueryinformationpolicy_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinformationpolicy_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	guint16 level;
@@ -1117,7 +1117,7 @@ lsa_dissect_POLICY_INFORMATION(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaqueryinformationpolicy_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinformationpolicy_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* This is really a pointer to a pointer though the first level is REF
@@ -1133,7 +1133,7 @@ lsa_dissect_lsaqueryinformationpolicy_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsadelete_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardelete_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1143,7 +1143,7 @@ lsa_dissect_lsadelete_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsadelete_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardelete_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1154,7 +1154,7 @@ lsa_dissect_lsadelete_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerysecurityobject_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerysecurityobject_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1168,7 +1168,7 @@ lsa_dissect_lsaquerysecurityobject_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerysecurityobject_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerysecurityobject_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -1183,7 +1183,7 @@ lsa_dissect_lsaquerysecurityobject_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetsecurityobject_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsecurityobject_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1200,7 +1200,7 @@ lsa_dissect_lsasetsecurityobject_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetsecurityobject_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsecurityobject_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1211,7 +1211,7 @@ lsa_dissect_lsasetsecurityobject_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsachangepassword_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarchangepassword_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* server */
@@ -1238,7 +1238,7 @@ lsa_dissect_lsachangepassword_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsachangepassword_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarchangepassword_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1328,7 +1328,7 @@ lsa_dissect_LSA_TRANSLATED_NAMES(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupsids_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupsids_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1617,7 +1617,7 @@ lsa_dissect_LSA_REFERENCED_DOMAIN_LIST(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupsids_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupsids_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -1639,7 +1639,7 @@ lsa_dissect_lsalookupsids_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1654,7 +1654,7 @@ lsa_dissect_lsasetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetquotasforaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetquotasforaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1665,7 +1665,7 @@ lsa_dissect_lsasetquotasforaccount_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsagetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1676,7 +1676,7 @@ lsa_dissect_lsagetquotasforaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsagetquotasforaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetquotasforaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -1691,7 +1691,7 @@ lsa_dissect_lsagetquotasforaccount_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetinformationpolicy_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationpolicy_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1709,7 +1709,7 @@ lsa_dissect_lsasetinformationpolicy_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetinformationpolicy_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationpolicy_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1720,7 +1720,7 @@ lsa_dissect_lsasetinformationpolicy_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaclearauditlog_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclearauditlog_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1738,7 +1738,7 @@ lsa_dissect_lsaclearauditlog_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaclearauditlog_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclearauditlog_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1751,7 +1751,7 @@ lsa_dissect_lsaclearauditlog_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsagetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1762,7 +1762,7 @@ lsa_dissect_lsagetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsagetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
         offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep,
@@ -1776,7 +1776,7 @@ lsa_dissect_lsagetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1790,7 +1790,7 @@ lsa_dissect_lsasetsystemaccessaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1801,7 +1801,7 @@ lsa_dissect_lsasetsystemaccessaccount_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopentrusteddomain_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropentrusteddomain_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1818,7 +1818,7 @@ lsa_dissect_lsaopentrusteddomain_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopentrusteddomain_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropentrusteddomain_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1832,7 +1832,7 @@ lsa_dissect_lsaopentrusteddomain_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsadeletetrusteddomain_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardeletetrusteddomain_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1846,7 +1846,7 @@ lsa_dissect_lsadeletetrusteddomain_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsadeletetrusteddomain_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardeletetrusteddomain_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -1941,7 +1941,7 @@ lsa_dissect_LSA_PRIVILEGES(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateprivileges_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateprivileges_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1957,7 +1957,7 @@ lsa_dissect_lsaenumerateprivileges_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateprivileges_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateprivileges_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -1974,7 +1974,7 @@ lsa_dissect_lsaenumerateprivileges_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupprivilegevalue_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegevalue_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -1990,7 +1990,7 @@ lsa_dissect_lsalookupprivilegevalue_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupprivilegevalue_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegevalue_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 
@@ -2005,7 +2005,7 @@ lsa_dissect_lsalookupprivilegevalue_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupprivilegename_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegename_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -2021,7 +2021,7 @@ lsa_dissect_lsalookupprivilegename_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupprivilegename_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegename_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] LSA_UNICODE_STRING **name */
@@ -2037,7 +2037,7 @@ lsa_dissect_lsalookupprivilegename_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaenumerateprivilegesaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateprivilegesaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2110,7 +2110,7 @@ lsa_dissect_LUID_AND_ATTRIBUTES_ARRAY(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateprivilegesaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateprivilegesaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] LUID_AND_ATTRIBUTES_ARRAY * *privs */
@@ -2125,7 +2125,7 @@ lsa_dissect_lsaenumerateprivilegesaccount_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaaddprivilegestoaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaraddprivilegestoaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2141,7 +2141,7 @@ lsa_dissect_lsaaddprivilegestoaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaaddprivilegestoaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaraddprivilegestoaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2151,7 +2151,7 @@ lsa_dissect_lsaaddprivilegestoaccount_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaremoveprivilegesfromaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarremoveprivilegesfromaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2172,7 +2172,7 @@ lsa_dissect_lsaremoveprivilegesfromaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaremoveprivilegesfromaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarremoveprivilegesfromaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2182,7 +2182,7 @@ lsa_dissect_lsaremoveprivilegesfromaccount_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateaccounts_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccounts_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2201,7 +2201,7 @@ lsa_dissect_lsaenumerateaccounts_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateaccounts_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccounts_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in,out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */
@@ -2220,7 +2220,7 @@ lsa_dissect_lsaenumerateaccounts_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreatetrusteddomain_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatetrusteddomain_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd_pol */
@@ -2240,7 +2240,7 @@ lsa_dissect_lsacreatetrusteddomain_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreatetrusteddomain_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatetrusteddomain_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_HANDLE *hnd */
@@ -2254,7 +2254,7 @@ lsa_dissect_lsacreatetrusteddomain_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumeratetrusteddomains_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2335,7 +2335,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_LIST(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumeratetrusteddomains_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in, out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */
@@ -2454,7 +2454,7 @@ lsa_dissect_LSA_TRANSLATED_SIDS(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupnames_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupnames_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2488,7 +2488,7 @@ lsa_dissect_lsalookupnames_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupnames_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupnames_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_REFERENCED_DOMAIN_LIST *domains */
@@ -2512,7 +2512,7 @@ lsa_dissect_lsalookupnames_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreatesecret_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatesecret_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd_pol */
@@ -2531,7 +2531,7 @@ lsa_dissect_lsacreatesecret_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreatesecret_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatesecret_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 
@@ -2546,7 +2546,7 @@ lsa_dissect_lsacreatesecret_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopenaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd_pol */
@@ -2566,7 +2566,7 @@ lsa_dissect_lsaopenaccount_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopenaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropenaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_HANDLE *hnd */
@@ -2667,7 +2667,7 @@ lsa_dissect_TRUSTED_DOMAIN_INFORMATION(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaqueryinfotrusteddomain_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinfotrusteddomain_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2683,7 +2683,7 @@ lsa_dissect_lsaqueryinfotrusteddomain_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaqueryinfotrusteddomain_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinfotrusteddomain_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] TRUSTED_DOMAIN_INFORMATION *info */
@@ -2698,7 +2698,7 @@ lsa_dissect_lsaqueryinfotrusteddomain_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetinformationtrusteddomain_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationtrusteddomain_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2719,7 +2719,7 @@ lsa_dissect_lsasetinformationtrusteddomain_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetinformationtrusteddomain_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationtrusteddomain_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2729,7 +2729,7 @@ lsa_dissect_lsasetinformationtrusteddomain_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopensecret_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropensecret_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd_pol */
@@ -2751,7 +2751,7 @@ lsa_dissect_lsaopensecret_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopensecret_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropensecret_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_HANDLE *hnd */
@@ -2765,7 +2765,7 @@ lsa_dissect_lsaopensecret_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetsecret_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsecret_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2787,7 +2787,7 @@ lsa_dissect_lsasetsecret_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasetsecret_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetsecret_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2797,7 +2797,7 @@ lsa_dissect_lsasetsecret_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaquerysecret_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerysecret_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2829,7 +2829,7 @@ lsa_dissect_lsaquerysecret_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerysecret_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerysecret_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in, out, unique] LSA_SECRET **curr_val */
@@ -2859,7 +2859,7 @@ lsa_dissect_lsaquerysecret_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsadeleteobject_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardeleteobject_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2871,7 +2871,7 @@ lsa_dissect_lsadeleteobject_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsadeleteobject_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsardeleteobject_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2881,7 +2881,7 @@ lsa_dissect_lsadeleteobject_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateaccountswithuserright_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccountswithuserright_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2897,7 +2897,7 @@ lsa_dissect_lsaenumerateaccountswithuserright_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateaccountswithuserright_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccountswithuserright_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] LSA_UNICODE_STRING_ARRAY *accounts */
@@ -2912,7 +2912,7 @@ lsa_dissect_lsaenumerateaccountswithuserright_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumerateaccountrights_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccountrights_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2928,7 +2928,7 @@ lsa_dissect_lsaenumerateaccountrights_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaenumerateaccountrights_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumerateaccountrights_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] LSA_UNICODE_STRING_ARRAY *rights */
@@ -2943,7 +2943,7 @@ lsa_dissect_lsaenumerateaccountrights_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaaddaccountrights_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaraddaccountrights_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2964,7 +2964,7 @@ lsa_dissect_lsaaddaccountrights_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaaddaccountrights_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaraddaccountrights_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -2974,7 +2974,7 @@ lsa_dissect_lsaaddaccountrights_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaremoveaccountrights_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarremoveaccountrights_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -2999,7 +2999,7 @@ lsa_dissect_lsaremoveaccountrights_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaremoveaccountrights_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarremoveaccountrights_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3010,7 +3010,7 @@ lsa_dissect_lsaremoveaccountrights_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerytrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerytrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE handle */
@@ -3031,7 +3031,7 @@ lsa_dissect_lsaquerytrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerytrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerytrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] TRUSTED_DOMAIN_INFORMATION *info) */
@@ -3047,7 +3047,7 @@ lsa_dissect_lsaquerytrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasettrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsettrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE handle */
@@ -3073,7 +3073,7 @@ lsa_dissect_lsasettrusteddomaininfobyname_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasettrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsettrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3083,7 +3083,7 @@ lsa_dissect_lsasettrusteddomaininfobyname_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE handle */
@@ -3102,7 +3102,7 @@ lsa_dissect_lsaquerytrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaopentrusteddomainbyname_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropentrusteddomainbyname_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE handle */
@@ -3123,7 +3123,7 @@ lsa_dissect_lsaopentrusteddomainbyname_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaopentrusteddomainbyname_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsaropentrusteddomainbyname_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_HANDLE handle */
@@ -3139,7 +3139,7 @@ lsa_dissect_lsaopentrusteddomainbyname_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaquerytrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerytrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] TRUSTED_DOMAIN_INFORMATION *info) */
@@ -3154,7 +3154,7 @@ lsa_dissect_lsaquerytrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE handle */
@@ -3179,7 +3179,7 @@ lsa_dissect_lsasettrusteddomaininfo_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsasettrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsettrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3189,7 +3189,7 @@ lsa_dissect_lsasettrusteddomaininfo_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3202,7 +3202,7 @@ lsa_dissect_lsaqueryinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* This is really a pointer to a pointer though the first level is REF
@@ -3218,7 +3218,7 @@ lsa_dissect_lsaqueryinformationpolicy2_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3235,7 +3235,7 @@ lsa_dissect_lsasetinformationpolicy2_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetinformationpolicy2_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetinformationpolicy2_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3245,7 +3245,7 @@ lsa_dissect_lsasetinformationpolicy2_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaquerydomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerydomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3258,7 +3258,7 @@ lsa_dissect_lsaquerydomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaquerydomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarquerydomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -3272,7 +3272,7 @@ lsa_dissect_lsaquerydomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetdomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetdomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3289,7 +3289,7 @@ lsa_dissect_lsasetdomaininformationpolicy_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsasetdomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarsetdomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3299,7 +3299,7 @@ lsa_dissect_lsasetdomaininformationpolicy_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupnames2_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupnames2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3341,7 +3341,7 @@ lsa_dissect_lsalookupnames2_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupnames2_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupnames2_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_REFERENCED_DOMAIN_LIST *domains */
@@ -3366,7 +3366,7 @@ lsa_dissect_lsalookupnames2_reply(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsacreateaccount_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreateaccount_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3383,7 +3383,7 @@ lsa_dissect_lsacreateaccount_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreateaccount_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreateaccount_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3396,7 +3396,7 @@ lsa_dissect_lsacreateaccount_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupprivilegedisplayname_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegedisplayname_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3416,7 +3416,7 @@ lsa_dissect_lsalookupprivilegedisplayname_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupprivilegedisplayname_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupprivilegedisplayname_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out, ref] LSA_UNICODE_STRING **disp_name */
@@ -3435,7 +3435,7 @@ lsa_dissect_lsalookupprivilegedisplayname_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsastoreprivatedata_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarstoreprivatedata_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3456,7 +3456,7 @@ lsa_dissect_lsastoreprivatedata_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsastoreprivatedata_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarstoreprivatedata_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ntstatus(
@@ -3466,7 +3466,7 @@ lsa_dissect_lsastoreprivatedata_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaretrieveprivatedata_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarretrieveprivatedata_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3487,7 +3487,7 @@ lsa_dissect_lsaretrieveprivatedata_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaretrieveprivatedata_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarretrieveprivatedata_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in, out, ref] LSA_SECRET **data */
@@ -3502,7 +3502,7 @@ lsa_dissect_lsaretrieveprivatedata_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaclosetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclosetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 
@@ -3515,7 +3515,7 @@ lsa_dissect_lsaclosetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsaclosetrusteddomainex_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarclosetrusteddomainex_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 
@@ -3589,7 +3589,7 @@ lsa_dissect_LSA_TRANSLATED_NAMES_EX(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsalookupsids2_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupsids2_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_nt_policy_hnd(tvb, offset, pinfo, tree, drep,
@@ -3621,7 +3621,7 @@ lsa_dissect_lsalookupsids2_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsalookupsids2_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarlookupsids2_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	offset = dissect_ndr_pointer(tvb, offset, pinfo, tree, drep,
@@ -3642,7 +3642,7 @@ lsa_dissect_lsalookupsids2_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsagetusername_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetusername_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 
@@ -3666,7 +3666,7 @@ lsa_dissect_lsagetusername_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsagetusername_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsargetusername_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in, out, ref] LSA_UNICODE_STRING **user */
@@ -3686,7 +3686,7 @@ lsa_dissect_lsagetusername_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsacreatetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3712,7 +3712,7 @@ lsa_dissect_lsacreatetrusteddomainex_rqst(tvbuff_t *tvb, int offset,
 
 
 static int
-lsa_dissect_lsacreatetrusteddomainex_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarcreatetrusteddomainex_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [out] LSA_HANDLE *tdHnd) */
@@ -3726,7 +3726,7 @@ lsa_dissect_lsacreatetrusteddomainex_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumeratetrusteddomainsex_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in] LSA_HANDLE hnd */
@@ -3778,7 +3778,7 @@ lsa_dissect_LSA_TRUSTED_DOMAIN_INFORMATION_LIST_EX(tvbuff_t *tvb, int offset,
 }
 
 static int
-lsa_dissect_lsaenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset,
+lsa_dissect_lsarenumeratetrusteddomainsex_reply(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, char *drep)
 {
 	/* [in, out, ref] LSA_ENUMERATION_HANDLE *resume_hnd */
@@ -3874,183 +3874,183 @@ lsa_dissect_lsafunction_3b_reply(tvbuff_t *tvb, int offset,
 
 
 static dcerpc_sub_dissector dcerpc_lsa_dissectors[] = {
-	{ LSA_LSACLOSE, "Close",
-		lsa_dissect_lsaclose_rqst,
-		lsa_dissect_lsaclose_reply },
-	{ LSA_LSADELETE, "Delete",
-		lsa_dissect_lsadelete_rqst,
-		lsa_dissect_lsadelete_reply },
-	{ LSA_LSAENUMERATEPRIVILEGES, "EnumPrivs",
-		lsa_dissect_lsaenumerateprivileges_rqst,
-		lsa_dissect_lsaenumerateprivileges_reply },
-	{ LSA_LSAQUERYSECURITYOBJECT, "QuerySecObject",
-		lsa_dissect_lsaquerysecurityobject_rqst,
-		lsa_dissect_lsaquerysecurityobject_reply },
-	{ LSA_LSASETSECURITYOBJECT, "SetSecObject",
-		lsa_dissect_lsasetsecurityobject_rqst,
-		lsa_dissect_lsasetsecurityobject_reply },
-	{ LSA_LSACHANGEPASSWORD, "ChangePassword",
-		lsa_dissect_lsachangepassword_rqst,
-		lsa_dissect_lsachangepassword_reply },
-	{ LSA_LSAOPENPOLICY, "OpenPolicy",
-		lsa_dissect_lsaopenpolicy_rqst,
-		lsa_dissect_lsaopenpolicy_reply },
-	{ LSA_LSAQUERYINFORMATIONPOLICY, "QueryInfoPolicy",
-		lsa_dissect_lsaqueryinformationpolicy_rqst,
-		lsa_dissect_lsaqueryinformationpolicy_reply },
-	{ LSA_LSASETINFORMATIONPOLICY, "SetInfoPolicy",
-		lsa_dissect_lsasetinformationpolicy_rqst,
-		lsa_dissect_lsasetinformationpolicy_reply },
-	{ LSA_LSACLEARAUDITLOG, "ClearAuditLog",
-		lsa_dissect_lsaclearauditlog_rqst,
-		lsa_dissect_lsaclearauditlog_reply },
-	{ LSA_LSACREATEACCOUNT, "CreateAccount",
-		lsa_dissect_lsacreateaccount_rqst,
-		lsa_dissect_lsacreateaccount_reply },
-	{ LSA_LSAENUMERATEACCOUNTS, "EnumAccounts",
-		lsa_dissect_lsaenumerateaccounts_rqst,
-		lsa_dissect_lsaenumerateaccounts_reply },
-	{ LSA_LSACREATETRUSTEDDOMAIN, "CreateTrustedDomain",
-		lsa_dissect_lsacreatetrusteddomain_rqst,
-		lsa_dissect_lsacreatetrusteddomain_reply },
-	{ LSA_LSAENUMERATETRUSTEDDOMAINS, "EnumTrustedDomains",
-		lsa_dissect_lsaenumeratetrusteddomains_rqst,
-		lsa_dissect_lsaenumeratetrusteddomains_reply },
-	{ LSA_LSALOOKUPNAMES, "LookupNames",
-		lsa_dissect_lsalookupnames_rqst,
-		lsa_dissect_lsalookupnames_reply },
-	{ LSA_LSALOOKUPSIDS, "LookupSIDs",
-		lsa_dissect_lsalookupsids_rqst,
-		lsa_dissect_lsalookupsids_reply },
-	{ LSA_LSACREATESECRET, "CreateSecret",
-		lsa_dissect_lsacreatesecret_rqst,
-		lsa_dissect_lsacreatesecret_reply },
-	{ LSA_LSAOPENACCOUNT, "OpenAccount",
-		lsa_dissect_lsaopenaccount_rqst,
-		lsa_dissect_lsaopenaccount_reply },
-	{ LSA_LSAENUMERATEPRIVILEGESACCOUNT, "EnumPrivsAccount",
-		lsa_dissect_lsaenumerateprivilegesaccount_rqst,
-		lsa_dissect_lsaenumerateprivilegesaccount_reply },
-	{ LSA_LSAADDPRIVILEGESTOACCOUNT, "AddPrivsToAccount",
-		lsa_dissect_lsaaddprivilegestoaccount_rqst,
-		lsa_dissect_lsaaddprivilegestoaccount_reply },
-	{ LSA_LSAREMOVEPRIVILEGESFROMACCOUNT, "MovePrivsFromAccount",
-		lsa_dissect_lsaremoveprivilegesfromaccount_rqst,
-		lsa_dissect_lsaremoveprivilegesfromaccount_reply },
-	{ LSA_LSAGETQUOTASFORACCOUNT, "GetQuotasForAccount",
-		lsa_dissect_lsagetquotasforaccount_rqst,
-		lsa_dissect_lsagetquotasforaccount_reply },
-	{ LSA_LSASETQUOTASFORACCOUNT, "SetQuotasForAccount",
-		lsa_dissect_lsasetquotasforaccount_rqst,
-		lsa_dissect_lsasetquotasforaccount_reply },
-	{ LSA_LSAGETSYSTEMACCESSACCOUNT, "GetSystemAccessAccount",
-		lsa_dissect_lsagetsystemaccessaccount_rqst,
-		lsa_dissect_lsagetsystemaccessaccount_reply },
-	{ LSA_LSASETSYSTEMACCESSACCOUNT, "SetSystemAccessAccount",
-		lsa_dissect_lsasetsystemaccessaccount_rqst,
-		lsa_dissect_lsasetsystemaccessaccount_reply },
-	{ LSA_LSAOPENTRUSTEDDOMAIN, "OpenTrustedDomain",
-		lsa_dissect_lsaopentrusteddomain_rqst,
-		lsa_dissect_lsaopentrusteddomain_reply },
-	{ LSA_LSAQUERYINFOTRUSTEDDOMAIN, "QueryInfoTrustedDomain",
-		lsa_dissect_lsaqueryinfotrusteddomain_rqst,
-		lsa_dissect_lsaqueryinfotrusteddomain_reply },
-	{ LSA_LSASETINFORMATIONTRUSTEDDOMAIN, "SetInfoTrustedDomain",
-		lsa_dissect_lsasetinformationtrusteddomain_rqst,
-		lsa_dissect_lsasetinformationtrusteddomain_reply },
-	{ LSA_LSAOPENSECRET, "OpenSecret",
-		lsa_dissect_lsaopensecret_rqst,
-		lsa_dissect_lsaopensecret_reply },
-	{ LSA_LSASETSECRET, "SetSecret",
-		lsa_dissect_lsasetsecret_rqst,
-		lsa_dissect_lsasetsecret_reply },
-	{ LSA_LSAQUERYSECRET, "QuerySecret",
-		lsa_dissect_lsaquerysecret_rqst,
-		lsa_dissect_lsaquerysecret_reply },
-	{ LSA_LSALOOKUPPRIVILEGEVALUE, "LookupPrivValue",
-		lsa_dissect_lsalookupprivilegevalue_rqst,
-		lsa_dissect_lsalookupprivilegevalue_reply },
-	{ LSA_LSALOOKUPPRIVILEGENAME, "LookupPrivName",
-		lsa_dissect_lsalookupprivilegename_rqst,
-		lsa_dissect_lsalookupprivilegename_reply },
-	{ LSA_LSALOOKUPPRIVILEGEDISPLAYNAME, "LookupPrivDispName",
-		lsa_dissect_lsalookupprivilegedisplayname_rqst,
-		lsa_dissect_lsalookupprivilegedisplayname_reply },
-	{ LSA_LSADELETEOBJECT, "DeleteObject",
-		lsa_dissect_lsadeleteobject_rqst,
-		lsa_dissect_lsadeleteobject_reply },
-	{ LSA_LSAENUMERATEACCOUNTSWITHUSERRIGHT, "EnumAccountsWithUserRight",
-		lsa_dissect_lsaenumerateaccountswithuserright_rqst,
-		lsa_dissect_lsaenumerateaccountswithuserright_reply },
-	{ LSA_LSAENUMERATEACCOUNTRIGHTS, "EnumAccountRights",
-		lsa_dissect_lsaenumerateaccountrights_rqst,
-		lsa_dissect_lsaenumerateaccountrights_reply },
-	{ LSA_LSAADDACCOUNTRIGHTS, "AddAccountRights",
-		lsa_dissect_lsaaddaccountrights_rqst,
-		lsa_dissect_lsaaddaccountrights_reply },
-	{ LSA_LSAREMOVEACCOUNTRIGHTS, "RemoveAccountRights",
-		lsa_dissect_lsaremoveaccountrights_rqst,
-		lsa_dissect_lsaremoveaccountrights_reply },
-	{ LSA_LSAQUERYTRUSTEDDOMAININFO, "QueryTrustedDomainInfo",
-		lsa_dissect_lsaquerytrusteddomaininfo_rqst,
-		lsa_dissect_lsaquerytrusteddomaininfo_reply },
-	{ LSA_LSASETTRUSTEDDOMAININFO, "SetTrustedDomainInfo",
-		lsa_dissect_lsasettrusteddomaininfo_rqst,
-		lsa_dissect_lsasettrusteddomaininfo_reply },
-	{ LSA_LSADELETETRUSTEDDOMAIN, "DeleteTrsutedDomain",
-		lsa_dissect_lsadeletetrusteddomain_rqst,
-		lsa_dissect_lsadeletetrusteddomain_reply },
-	{ LSA_LSASTOREPRIVATEDATA, "StorePrivateData",
-		lsa_dissect_lsastoreprivatedata_rqst,
-		lsa_dissect_lsastoreprivatedata_reply },
-	{ LSA_LSARETRIEVEPRIVATEDATA, "RetrievePrivateData",
-		lsa_dissect_lsaretrieveprivatedata_rqst,
-		lsa_dissect_lsaretrieveprivatedata_reply },
-	{ LSA_LSAOPENPOLICY2, "OpenPolicy2",
-		lsa_dissect_lsaopenpolicy2_rqst,
-		lsa_dissect_lsaopenpolicy2_reply },
-	{ LSA_LSAGETUSERNAME, "GetUsername",
-		lsa_dissect_lsagetusername_rqst,
-		lsa_dissect_lsagetusername_reply },
-	{ LSA_LSAQUERYINFORMATIONPOLICY2, "QueryInformationPolicy2",
-		lsa_dissect_lsaqueryinformationpolicy2_rqst,
-		lsa_dissect_lsaqueryinformationpolicy2_reply },
-	{ LSA_LSASETINFORMATIONPOLICY2, "SetInformationPolicy2",
-		lsa_dissect_lsasetinformationpolicy2_rqst,
-		lsa_dissect_lsasetinformationpolicy2_reply },
-	{ LSA_LSAQUERYTRUSTEDDOMAININFOBYNAME, "QueryTrustedDomainInfoByName",
-		lsa_dissect_lsaquerytrusteddomaininfobyname_rqst,
-		lsa_dissect_lsaquerytrusteddomaininfobyname_reply },
-	{ LSA_LSASETTRUSTEDDOMAININFOBYNAME, "SetTrustedDomainInfoByName",
-		lsa_dissect_lsasettrusteddomaininfobyname_rqst,
-		lsa_dissect_lsasettrusteddomaininfobyname_reply },
-	{ LSA_LSAENUMERATETRUSTEDDOMAINSEX, "EnumTrustedDomainsEx",
-		lsa_dissect_lsaenumeratetrusteddomainsex_rqst,
-		lsa_dissect_lsaenumeratetrusteddomainsex_reply },
-	{ LSA_LSACREATETRUSTEDDOMAINEX, "CreateTrustedDomainEx",
-		lsa_dissect_lsacreatetrusteddomainex_rqst,
-		lsa_dissect_lsacreatetrusteddomainex_reply },
-	{ LSA_LSACLOSETRUSTEDDOMAINEX, "CloseTrustedDomainEx",
-		lsa_dissect_lsaclosetrusteddomainex_rqst,
-		lsa_dissect_lsaclosetrusteddomainex_reply },
-	{ LSA_LSAQUERYDOMAININFORMATIONPOLICY, "QueryDomainInfoPolicy",
-		lsa_dissect_lsaquerydomaininformationpolicy_rqst,
-		lsa_dissect_lsaquerydomaininformationpolicy_reply },
-	{ LSA_LSASETDOMAININFORMATIONPOLICY, "SetDomainInfoPolicy",
-		lsa_dissect_lsasetdomaininformationpolicy_rqst,
-		lsa_dissect_lsasetdomaininformationpolicy_reply },
-	{ LSA_LSAOPENTRUSTEDDOMAINBYNAME, "OpenTrustedDomainByName",
-		lsa_dissect_lsaopentrusteddomainbyname_rqst,
-		lsa_dissect_lsaopentrusteddomainbyname_reply },
+	{ LSA_LSARCLOSE, "LsarClose",
+		lsa_dissect_lsarclose_rqst,
+		lsa_dissect_lsarclose_reply },
+	{ LSA_LSARDELETE, "LsarDelete",
+		lsa_dissect_lsardelete_rqst,
+		lsa_dissect_lsardelete_reply },
+	{ LSA_LSARENUMERATEPRIVILEGES, "LsarEnumeratePrivileges",
+		lsa_dissect_lsarenumerateprivileges_rqst,
+		lsa_dissect_lsarenumerateprivileges_reply },
+	{ LSA_LSARQUERYSECURITYOBJECT, "LsarQuerySecurityObject",
+		lsa_dissect_lsarquerysecurityobject_rqst,
+		lsa_dissect_lsarquerysecurityobject_reply },
+	{ LSA_LSARSETSECURITYOBJECT, "LsarSetSecurityObject",
+		lsa_dissect_lsarsetsecurityobject_rqst,
+		lsa_dissect_lsarsetsecurityobject_reply },
+	{ LSA_LSARCHANGEPASSWORD, "LsarChangePassword",
+		lsa_dissect_lsarchangepassword_rqst,
+		lsa_dissect_lsarchangepassword_reply },
+	{ LSA_LSAROPENPOLICY, "LsarOpenPolicy",
+		lsa_dissect_lsaropenpolicy_rqst,
+		lsa_dissect_lsaropenpolicy_reply },
+	{ LSA_LSARQUERYINFORMATIONPOLICY, "LsarQueryInformationPolicy",
+		lsa_dissect_lsarqueryinformationpolicy_rqst,
+		lsa_dissect_lsarqueryinformationpolicy_reply },
+	{ LSA_LSARSETINFORMATIONPOLICY, "LsarSetInformationPolicy",
+		lsa_dissect_lsarsetinformationpolicy_rqst,
+		lsa_dissect_lsarsetinformationpolicy_reply },
+	{ LSA_LSARCLEARAUDITLOG, "LsarClearAuditLog",
+		lsa_dissect_lsarclearauditlog_rqst,
+		lsa_dissect_lsarclearauditlog_reply },
+	{ LSA_LSARCREATEACCOUNT, "LsarCreateAccount",
+		lsa_dissect_lsarcreateaccount_rqst,
+		lsa_dissect_lsarcreateaccount_reply },
+	{ LSA_LSARENUMERATEACCOUNTS, "LsarEnumerateAccounts",
+		lsa_dissect_lsarenumerateaccounts_rqst,
+		lsa_dissect_lsarenumerateaccounts_reply },
+	{ LSA_LSARCREATETRUSTEDDOMAIN, "LsarCreateTrustedDomain",
+		lsa_dissect_lsarcreatetrusteddomain_rqst,
+		lsa_dissect_lsarcreatetrusteddomain_reply },
+	{ LSA_LSARENUMERATETRUSTEDDOMAINS, "LsarEnumerateTrustedDomains",
+		lsa_dissect_lsarenumeratetrusteddomains_rqst,
+		lsa_dissect_lsarenumeratetrusteddomains_reply },
+	{ LSA_LSARLOOKUPNAMES, "LsarLookupNames",
+		lsa_dissect_lsarlookupnames_rqst,
+		lsa_dissect_lsarlookupnames_reply },
+	{ LSA_LSARLOOKUPSIDS, "LsarLookupSids",
+		lsa_dissect_lsarlookupsids_rqst,
+		lsa_dissect_lsarlookupsids_reply },
+	{ LSA_LSARCREATESECRET, "LsarCreateSecret",
+		lsa_dissect_lsarcreatesecret_rqst,
+		lsa_dissect_lsarcreatesecret_reply },
+	{ LSA_LSAROPENACCOUNT, "LsarOpenAccount",
+		lsa_dissect_lsaropenaccount_rqst,
+		lsa_dissect_lsaropenaccount_reply },
+	{ LSA_LSARENUMERATEPRIVILEGESACCOUNT, "LsarEnumeratePrivilegesAccount",
+		lsa_dissect_lsarenumerateprivilegesaccount_rqst,
+		lsa_dissect_lsarenumerateprivilegesaccount_reply },
+	{ LSA_LSARADDPRIVILEGESTOACCOUNT, "LsarAddPrivilegesToAccount",
+		lsa_dissect_lsaraddprivilegestoaccount_rqst,
+		lsa_dissect_lsaraddprivilegestoaccount_reply },
+	{ LSA_LSARREMOVEPRIVILEGESFROMACCOUNT, "LsarRemovePrivilegesFromAccount",
+		lsa_dissect_lsarremoveprivilegesfromaccount_rqst,
+		lsa_dissect_lsarremoveprivilegesfromaccount_reply },
+	{ LSA_LSARGETQUOTASFORACCOUNT, "LsarGetQuotasForAccount",
+		lsa_dissect_lsargetquotasforaccount_rqst,
+		lsa_dissect_lsargetquotasforaccount_reply },
+	{ LSA_LSARSETQUOTASFORACCOUNT, "LsarSetQuotasForAccount",
+		lsa_dissect_lsarsetquotasforaccount_rqst,
+		lsa_dissect_lsarsetquotasforaccount_reply },
+	{ LSA_LSARGETSYSTEMACCESSACCOUNT, "LsarGetSystemAccessAccount",
+		lsa_dissect_lsargetsystemaccessaccount_rqst,
+		lsa_dissect_lsargetsystemaccessaccount_reply },
+	{ LSA_LSARSETSYSTEMACCESSACCOUNT, "LsarSetSystemAccessAccount",
+		lsa_dissect_lsarsetsystemaccessaccount_rqst,
+		lsa_dissect_lsarsetsystemaccessaccount_reply },
+	{ LSA_LSAROPENTRUSTEDDOMAIN, "LsarOpenTrustedDomain",
+		lsa_dissect_lsaropentrusteddomain_rqst,
+		lsa_dissect_lsaropentrusteddomain_reply },
+	{ LSA_LSARQUERYINFOTRUSTEDDOMAIN, "LsarQueryInfoTrustedDomain",
+		lsa_dissect_lsarqueryinfotrusteddomain_rqst,
+		lsa_dissect_lsarqueryinfotrusteddomain_reply },
+	{ LSA_LSARSETINFORMATIONTRUSTEDDOMAIN, "LsarSetInformationTrustedDomain",
+		lsa_dissect_lsarsetinformationtrusteddomain_rqst,
+		lsa_dissect_lsarsetinformationtrusteddomain_reply },
+	{ LSA_LSAROPENSECRET, "LsarOpenSecret",
+		lsa_dissect_lsaropensecret_rqst,
+		lsa_dissect_lsaropensecret_reply },
+	{ LSA_LSARSETSECRET, "LsarSetSecret",
+		lsa_dissect_lsarsetsecret_rqst,
+		lsa_dissect_lsarsetsecret_reply },
+	{ LSA_LSARQUERYSECRET, "LsarQuerySecret",
+		lsa_dissect_lsarquerysecret_rqst,
+		lsa_dissect_lsarquerysecret_reply },
+	{ LSA_LSARLOOKUPPRIVILEGEVALUE, "LsarLookupPrivilegeValue",
+		lsa_dissect_lsarlookupprivilegevalue_rqst,
+		lsa_dissect_lsarlookupprivilegevalue_reply },
+	{ LSA_LSARLOOKUPPRIVILEGENAME, "LsarLookupPrivilegeName",
+		lsa_dissect_lsarlookupprivilegename_rqst,
+		lsa_dissect_lsarlookupprivilegename_reply },
+	{ LSA_LSARLOOKUPPRIVILEGEDISPLAYNAME, "LsarLookupPrivilegeDisplayName",
+		lsa_dissect_lsarlookupprivilegedisplayname_rqst,
+		lsa_dissect_lsarlookupprivilegedisplayname_reply },
+	{ LSA_LSARDELETEOBJECT, "LsarDeleteObject",
+		lsa_dissect_lsardeleteobject_rqst,
+		lsa_dissect_lsardeleteobject_reply },
+	{ LSA_LSARENUMERATEACCOUNTSWITHUSERRIGHT, "LsarEnumerateAccountsWithUserRight",
+		lsa_dissect_lsarenumerateaccountswithuserright_rqst,
+		lsa_dissect_lsarenumerateaccountswithuserright_reply },
+	{ LSA_LSARENUMERATEACCOUNTRIGHTS, "LsarEnumerateAccountRights",
+		lsa_dissect_lsarenumerateaccountrights_rqst,
+		lsa_dissect_lsarenumerateaccountrights_reply },
+	{ LSA_LSARADDACCOUNTRIGHTS, "LsarAddAccountRights",
+		lsa_dissect_lsaraddaccountrights_rqst,
+		lsa_dissect_lsaraddaccountrights_reply },
+	{ LSA_LSARREMOVEACCOUNTRIGHTS, "LsarRemoveAccountRights",
+		lsa_dissect_lsarremoveaccountrights_rqst,
+		lsa_dissect_lsarremoveaccountrights_reply },
+	{ LSA_LSARQUERYTRUSTEDDOMAININFO, "LsarQueryTrustedDomainInfo",
+		lsa_dissect_lsarquerytrusteddomaininfo_rqst,
+		lsa_dissect_lsarquerytrusteddomaininfo_reply },
+	{ LSA_LSARSETTRUSTEDDOMAININFO, "LsarSetTrustedDomainInfo",
+		lsa_dissect_lsarsettrusteddomaininfo_rqst,
+		lsa_dissect_lsarsettrusteddomaininfo_reply },
+	{ LSA_LSARDELETETRUSTEDDOMAIN, "LsarDeleteTrustedDomain",
+		lsa_dissect_lsardeletetrusteddomain_rqst,
+		lsa_dissect_lsardeletetrusteddomain_reply },
+	{ LSA_LSARSTOREPRIVATEDATA, "LsarStorePrivateData",
+		lsa_dissect_lsarstoreprivatedata_rqst,
+		lsa_dissect_lsarstoreprivatedata_reply },
+	{ LSA_LSARRETRIEVEPRIVATEDATA, "LsarRetrievePrivateData",
+		lsa_dissect_lsarretrieveprivatedata_rqst,
+		lsa_dissect_lsarretrieveprivatedata_reply },
+	{ LSA_LSAROPENPOLICY2, "LsarOpenPolicy2",
+		lsa_dissect_lsaropenpolicy2_rqst,
+		lsa_dissect_lsaropenpolicy2_reply },
+	{ LSA_LSARGETUSERNAME, "LsarGetUsername",
+		lsa_dissect_lsargetusername_rqst,
+		lsa_dissect_lsargetusername_reply },
+	{ LSA_LSARQUERYINFORMATIONPOLICY2, "LsarQueryInformationPolicy2",
+		lsa_dissect_lsarqueryinformationpolicy2_rqst,
+		lsa_dissect_lsarqueryinformationpolicy2_reply },
+	{ LSA_LSARSETINFORMATIONPOLICY2, "LsarSetInformationPolicy2",
+		lsa_dissect_lsarsetinformationpolicy2_rqst,
+		lsa_dissect_lsarsetinformationpolicy2_reply },
+	{ LSA_LSARQUERYTRUSTEDDOMAININFOBYNAME, "LsarQueryTrustedDomainInfoByName",
+		lsa_dissect_lsarquerytrusteddomaininfobyname_rqst,
+		lsa_dissect_lsarquerytrusteddomaininfobyname_reply },
+	{ LSA_LSARSETTRUSTEDDOMAININFOBYNAME, "LsarSetTrustedDomainInfoByName",
+		lsa_dissect_lsarsettrusteddomaininfobyname_rqst,
+		lsa_dissect_lsarsettrusteddomaininfobyname_reply },
+	{ LSA_LSARENUMERATETRUSTEDDOMAINSEX, "LsarEnumerateTrustedDomainsEx",
+		lsa_dissect_lsarenumeratetrusteddomainsex_rqst,
+		lsa_dissect_lsarenumeratetrusteddomainsex_reply },
+	{ LSA_LSARCREATETRUSTEDDOMAINEX, "LsarCreateTrustedDomainEx",
+		lsa_dissect_lsarcreatetrusteddomainex_rqst,
+		lsa_dissect_lsarcreatetrusteddomainex_reply },
+	{ LSA_LSARCLOSETRUSTEDDOMAINEX, "LsarCloseTrustedDomainEx",
+		lsa_dissect_lsarclosetrusteddomainex_rqst,
+		lsa_dissect_lsarclosetrusteddomainex_reply },
+	{ LSA_LSARQUERYDOMAININFORMATIONPOLICY, "LsarQueryDomainInformationPolicy",
+		lsa_dissect_lsarquerydomaininformationpolicy_rqst,
+		lsa_dissect_lsarquerydomaininformationpolicy_reply },
+	{ LSA_LSARSETDOMAININFORMATIONPOLICY, "LsarSetDomainInformationPolicy",
+		lsa_dissect_lsarsetdomaininformationpolicy_rqst,
+		lsa_dissect_lsarsetdomaininformationpolicy_reply },
+	{ LSA_LSAROPENTRUSTEDDOMAINBYNAME, "LsarOpenTrustedDomainByName",
+		lsa_dissect_lsaropentrusteddomainbyname_rqst,
+		lsa_dissect_lsaropentrusteddomainbyname_reply },
 	{ LSA_LSAFUNCTION_38, "LSAFUNCTION_38",
 		lsa_dissect_lsafunction_38_rqst,
 		lsa_dissect_lsafunction_38_reply },
-	{ LSA_LSALOOKUPSIDS2, "LookupSIDs2",
-		lsa_dissect_lsalookupsids2_rqst,
-		lsa_dissect_lsalookupsids2_reply },
-	{ LSA_LSALOOKUPNAMES2, "LookupNames2",
-		lsa_dissect_lsalookupnames2_rqst,
-		lsa_dissect_lsalookupnames2_reply },
+	{ LSA_LSARLOOKUPSIDS2, "LsarLookupSids2",
+		lsa_dissect_lsarlookupsids2_rqst,
+		lsa_dissect_lsarlookupsids2_reply },
+	{ LSA_LSARLOOKUPNAMES2, "LsarLookupNames2",
+		lsa_dissect_lsarlookupnames2_rqst,
+		lsa_dissect_lsarlookupnames2_reply },
 	{ LSA_LSAFUNCTION_3B, "LSAFUNCTION_3B",
 		lsa_dissect_lsafunction_3b_rqst,
 		lsa_dissect_lsafunction_3b_reply },
diff --git a/packet-dcerpc-lsa.h b/packet-dcerpc-lsa.h
index 0bc85dc078..0eb372d0ee 100644
--- a/packet-dcerpc-lsa.h
+++ b/packet-dcerpc-lsa.h
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\lsarpc packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-lsa.h,v 1.10 2002/09/28 09:43:10 sahlberg Exp $
+ * $Id: packet-dcerpc-lsa.h,v 1.11 2003/09/23 12:06:20 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -26,65 +26,65 @@
 #ifndef __PACKET_DCERPC_LSA_H
 #define __PACKET_DCERPC_LSA_H
 
-#define LSA_LSACLOSE	0x00
-#define LSA_LSADELETE	0x01
-#define LSA_LSAENUMERATEPRIVILEGES	0x02
-#define LSA_LSAQUERYSECURITYOBJECT	0x03
-#define LSA_LSASETSECURITYOBJECT	0x04
-#define LSA_LSACHANGEPASSWORD	0x05
-#define LSA_LSAOPENPOLICY	0x06
-#define LSA_LSAQUERYINFORMATIONPOLICY	0x07
-#define LSA_LSASETINFORMATIONPOLICY	0x08
-#define LSA_LSACLEARAUDITLOG	0x09
-#define LSA_LSACREATEACCOUNT	0x0a
-#define LSA_LSAENUMERATEACCOUNTS	0x0b
-#define LSA_LSACREATETRUSTEDDOMAIN	0x0c
-#define LSA_LSAENUMERATETRUSTEDDOMAINS	0x0d
-#define LSA_LSALOOKUPNAMES	0x0e
-#define LSA_LSALOOKUPSIDS	0x0f
-#define LSA_LSACREATESECRET	0x10
-#define LSA_LSAOPENACCOUNT	0x11
-#define LSA_LSAENUMERATEPRIVILEGESACCOUNT	0x12
-#define LSA_LSAADDPRIVILEGESTOACCOUNT	0x13
-#define LSA_LSAREMOVEPRIVILEGESFROMACCOUNT	0x14
-#define LSA_LSAGETQUOTASFORACCOUNT	0x15
-#define LSA_LSASETQUOTASFORACCOUNT	0x16
-#define LSA_LSAGETSYSTEMACCESSACCOUNT	0x17
-#define LSA_LSASETSYSTEMACCESSACCOUNT	0x18
-#define LSA_LSAOPENTRUSTEDDOMAIN	0x19
-#define LSA_LSAQUERYINFOTRUSTEDDOMAIN	0x1a
-#define LSA_LSASETINFORMATIONTRUSTEDDOMAIN	0x1b
-#define LSA_LSAOPENSECRET	0x1c
-#define LSA_LSASETSECRET	0x1d
-#define LSA_LSAQUERYSECRET	0x1e
-#define LSA_LSALOOKUPPRIVILEGEVALUE	0x1f
-#define LSA_LSALOOKUPPRIVILEGENAME	0x20
-#define LSA_LSALOOKUPPRIVILEGEDISPLAYNAME	0x21
-#define LSA_LSADELETEOBJECT	0x22
-#define LSA_LSAENUMERATEACCOUNTSWITHUSERRIGHT	0x23
-#define LSA_LSAENUMERATEACCOUNTRIGHTS	0x24
-#define LSA_LSAADDACCOUNTRIGHTS	0x25
-#define LSA_LSAREMOVEACCOUNTRIGHTS	0x26
-#define LSA_LSAQUERYTRUSTEDDOMAININFO	0x27
-#define LSA_LSASETTRUSTEDDOMAININFO	0x28
-#define LSA_LSADELETETRUSTEDDOMAIN	0x29
-#define LSA_LSASTOREPRIVATEDATA	0x2a
-#define LSA_LSARETRIEVEPRIVATEDATA	0x2b
-#define LSA_LSAOPENPOLICY2	0x2c
-#define LSA_LSAGETUSERNAME	0x2d
-#define LSA_LSAQUERYINFORMATIONPOLICY2	0x2e
-#define LSA_LSASETINFORMATIONPOLICY2	0x2f
-#define LSA_LSAQUERYTRUSTEDDOMAININFOBYNAME	0x30
-#define LSA_LSASETTRUSTEDDOMAININFOBYNAME	0x31
-#define LSA_LSAENUMERATETRUSTEDDOMAINSEX	0x32
-#define LSA_LSACREATETRUSTEDDOMAINEX	0x33
-#define LSA_LSACLOSETRUSTEDDOMAINEX	0x34
-#define LSA_LSAQUERYDOMAININFORMATIONPOLICY	0x35
-#define LSA_LSASETDOMAININFORMATIONPOLICY	0x36
-#define LSA_LSAOPENTRUSTEDDOMAINBYNAME	0x37
+#define LSA_LSARCLOSE	0x00
+#define LSA_LSARDELETE	0x01
+#define LSA_LSARENUMERATEPRIVILEGES	0x02
+#define LSA_LSARQUERYSECURITYOBJECT	0x03
+#define LSA_LSARSETSECURITYOBJECT	0x04
+#define LSA_LSARCHANGEPASSWORD	0x05
+#define LSA_LSAROPENPOLICY	0x06
+#define LSA_LSARQUERYINFORMATIONPOLICY	0x07
+#define LSA_LSARSETINFORMATIONPOLICY	0x08
+#define LSA_LSARCLEARAUDITLOG	0x09
+#define LSA_LSARCREATEACCOUNT	0x0a
+#define LSA_LSARENUMERATEACCOUNTS	0x0b
+#define LSA_LSARCREATETRUSTEDDOMAIN	0x0c
+#define LSA_LSARENUMERATETRUSTEDDOMAINS	0x0d
+#define LSA_LSARLOOKUPNAMES	0x0e
+#define LSA_LSARLOOKUPSIDS	0x0f
+#define LSA_LSARCREATESECRET	0x10
+#define LSA_LSAROPENACCOUNT	0x11
+#define LSA_LSARENUMERATEPRIVILEGESACCOUNT	0x12
+#define LSA_LSARADDPRIVILEGESTOACCOUNT	0x13
+#define LSA_LSARREMOVEPRIVILEGESFROMACCOUNT	0x14
+#define LSA_LSARGETQUOTASFORACCOUNT	0x15
+#define LSA_LSARSETQUOTASFORACCOUNT	0x16
+#define LSA_LSARGETSYSTEMACCESSACCOUNT	0x17
+#define LSA_LSARSETSYSTEMACCESSACCOUNT	0x18
+#define LSA_LSAROPENTRUSTEDDOMAIN	0x19
+#define LSA_LSARQUERYINFOTRUSTEDDOMAIN	0x1a
+#define LSA_LSARSETINFORMATIONTRUSTEDDOMAIN	0x1b
+#define LSA_LSAROPENSECRET	0x1c
+#define LSA_LSARSETSECRET	0x1d
+#define LSA_LSARQUERYSECRET	0x1e
+#define LSA_LSARLOOKUPPRIVILEGEVALUE	0x1f
+#define LSA_LSARLOOKUPPRIVILEGENAME	0x20
+#define LSA_LSARLOOKUPPRIVILEGEDISPLAYNAME	0x21
+#define LSA_LSARDELETEOBJECT	0x22
+#define LSA_LSARENUMERATEACCOUNTSWITHUSERRIGHT	0x23
+#define LSA_LSARENUMERATEACCOUNTRIGHTS	0x24
+#define LSA_LSARADDACCOUNTRIGHTS	0x25
+#define LSA_LSARREMOVEACCOUNTRIGHTS	0x26
+#define LSA_LSARQUERYTRUSTEDDOMAININFO	0x27
+#define LSA_LSARSETTRUSTEDDOMAININFO	0x28
+#define LSA_LSARDELETETRUSTEDDOMAIN	0x29
+#define LSA_LSARSTOREPRIVATEDATA	0x2a
+#define LSA_LSARRETRIEVEPRIVATEDATA	0x2b
+#define LSA_LSAROPENPOLICY2	0x2c
+#define LSA_LSARGETUSERNAME	0x2d
+#define LSA_LSARQUERYINFORMATIONPOLICY2	0x2e
+#define LSA_LSARSETINFORMATIONPOLICY2	0x2f
+#define LSA_LSARQUERYTRUSTEDDOMAININFOBYNAME	0x30
+#define LSA_LSARSETTRUSTEDDOMAININFOBYNAME	0x31
+#define LSA_LSARENUMERATETRUSTEDDOMAINSEX	0x32
+#define LSA_LSARCREATETRUSTEDDOMAINEX	0x33
+#define LSA_LSARCLOSETRUSTEDDOMAINEX	0x34
+#define LSA_LSARQUERYDOMAININFORMATIONPOLICY	0x35
+#define LSA_LSARSETDOMAININFORMATIONPOLICY	0x36
+#define LSA_LSAROPENTRUSTEDDOMAINBYNAME	0x37
 #define LSA_LSAFUNCTION_38	0x38
-#define LSA_LSALOOKUPSIDS2	0x39
-#define LSA_LSALOOKUPNAMES2	0x3a
+#define LSA_LSARLOOKUPSIDS2	0x39
+#define LSA_LSARLOOKUPNAMES2	0x3a
 #define LSA_LSAFUNCTION_3B	0x3b
 
 int
diff --git a/packet-dcerpc-samr.c b/packet-dcerpc-samr.c
index 9ef1ed40fa..30bd1f702c 100644
--- a/packet-dcerpc-samr.c
+++ b/packet-dcerpc-samr.c
@@ -3,7 +3,7 @@
  * Copyright 2001,2003 Tim Potter <tpot@samba.org>
  *   2002 Added all command dissectors  Ronnie Sahlberg
  *
- * $Id: packet-dcerpc-samr.c,v 1.100 2003/08/04 02:49:00 tpot Exp $
+ * $Id: packet-dcerpc-samr.c,v 1.101 2003/09/23 12:06:20 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -1514,7 +1514,7 @@ samr_dissect_add_member_to_group_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_3c_rqst(tvbuff_t *tvb, int offset,
+samr_dissect_get_boot_key_information_rqst(tvbuff_t *tvb, int offset,
 			     packet_info *pinfo, proto_tree *tree,
 			     char *drep)
 {
@@ -1525,7 +1525,7 @@ samr_dissect_unknown_3c_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_3c_reply(tvbuff_t *tvb, int offset,
+samr_dissect_get_boot_key_information_reply(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
                              char *drep)
 {
@@ -2056,7 +2056,7 @@ samr_dissect_unicode_change_password_user2_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_3b_rqst(tvbuff_t *tvb, int offset,
+samr_dissect_set_boot_key_information_rqst(tvbuff_t *tvb, int offset,
                              packet_info *pinfo, proto_tree *tree,
                              char *drep)
 {
@@ -2075,7 +2075,7 @@ samr_dissect_unknown_3b_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_3b_reply(tvbuff_t *tvb, int offset,
+samr_dissect_set_boot_key_information_reply(tvbuff_t *tvb, int offset,
 			      packet_info *pinfo, proto_tree *tree,
 			      char *drep)
 {
@@ -3879,7 +3879,7 @@ samr_dissect_set_information_user2_reply(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_2f_rqst(tvbuff_t *tvb, int offset,
+samr_dissect_query_information_user2_rqst(tvbuff_t *tvb, int offset,
 				 packet_info *pinfo, proto_tree *tree,
 				 char *drep)
 {
@@ -3898,7 +3898,7 @@ samr_dissect_unknown_2f_rqst(tvbuff_t *tvb, int offset,
 }
 
 static int
-samr_dissect_unknown_2f_reply(tvbuff_t *tvb, int offset,
+samr_dissect_query_information_user2_reply(tvbuff_t *tvb, int offset,
 			packet_info *pinfo, proto_tree *tree,
 			char *drep)
 {
@@ -4897,187 +4897,190 @@ static dcerpc_sub_dissector dcerpc_samr_dissectors[] = {
         { SAMR_CONNECT, "SamrConnect",
 		samr_dissect_connect_anon_rqst,
 		samr_dissect_connect_anon_reply },
-        { SAMR_CLOSE_HND, "Close",
+        { SAMR_CLOSE_HND, "SamrCloseHandle",
 		samr_dissect_close_hnd_rqst,
 		samr_dissect_close_hnd_reply },
-        { SAMR_SET_SEC_OBJECT, "SetSecObject",
+        { SAMR_SET_SEC_OBJECT, "SamrSetSecurityObject",
 		samr_dissect_set_sec_object_rqst,
 		samr_dissect_set_sec_object_reply },
-        { SAMR_QUERY_SEC_OBJECT, "QuerySecObject",
+        { SAMR_QUERY_SEC_OBJECT, "SamrQuerySecurityObject",
 		samr_dissect_query_sec_object_rqst,
 		samr_dissect_query_sec_object_reply },
-        { SAMR_SHUTDOWN_SAM_SERVER, "ShutdownSamServer",
+        { SAMR_SHUTDOWN_SAM_SERVER, "SamrShutdownSamServer",
 		samr_dissect_shutdown_sam_server_rqst,
 		samr_dissect_shutdown_sam_server_reply },
-        { SAMR_LOOKUP_DOMAIN, "LookupDomain",
+        { SAMR_LOOKUP_DOMAIN, "SamrLookupDomainInSamServer",
 		samr_dissect_lookup_domain_rqst,
 		samr_dissect_lookup_domain_reply },
-        { SAMR_ENUM_DOMAINS, "EnumDomains",
+        { SAMR_ENUM_DOMAINS, "SamrEnumerateDomainsInSamServer",
 		samr_dissect_enum_domains_rqst,
 		samr_dissect_enum_domains_reply },
-        { SAMR_OPEN_DOMAIN, "OpenDomain",
+        { SAMR_OPEN_DOMAIN, "SamrOpenDomain",
 		samr_dissect_open_domain_rqst,
 		samr_dissect_open_domain_reply },
-	{ SAMR_QUERY_DOMAIN_INFO, "QueryDomainInfo",
+	{ SAMR_QUERY_DOMAIN_INFO, "SamrQueryInformationDomain",
 		samr_dissect_query_information_alias_rqst,
 		samr_dissect_query_information_domain_reply },
-        { SAMR_SET_DOMAIN_INFO, "SetDomainInfo",
+        { SAMR_SET_DOMAIN_INFO, "SamrSetInformationDomain",
 		samr_dissect_set_information_domain_rqst,
 		samr_dissect_set_information_domain_reply },
-        { SAMR_CREATE_DOM_GROUP, "CreateGroup",
+        { SAMR_CREATE_DOM_GROUP, "SamrCreateGroupInDomain",
 		samr_dissect_create_alias_in_domain_rqst,
 		samr_dissect_create_alias_in_domain_reply },
-        { SAMR_ENUM_DOM_GROUPS, "EnumDomainGroups",
+        { SAMR_ENUM_DOM_GROUPS, "SamrEnumerateGroupsInDomain",
 		samr_dissect_enum_dom_groups_rqst,
 		samr_dissect_enum_dom_groups_reply },
-	{ SAMR_CREATE_USER_IN_DOMAIN, "CreateUser",
+	{ SAMR_CREATE_USER_IN_DOMAIN, "SamrCreateUserInDomain",
 		samr_dissect_create_group_in_domain_rqst,
 		samr_dissect_create_group_in_domain_reply },
-        { SAMR_ENUM_DOM_USERS, "EnumDomainUsers",
+        { SAMR_ENUM_DOM_USERS, "SamrEnumerateUsersInDomain",
 		samr_dissect_enum_dom_groups_rqst,
 		samr_dissect_enum_dom_groups_reply },
-        { SAMR_CREATE_DOM_ALIAS, "CreateAlias",
+        { SAMR_CREATE_DOM_ALIAS, "SamrCreateAliasInDomain",
 		samr_dissect_create_alias_in_domain_rqst,
 		samr_dissect_create_alias_in_domain_reply },
-        { SAMR_ENUM_DOM_ALIASES, "EnumAliases",
+        { SAMR_ENUM_DOM_ALIASES, "SamrEnumerateAliasesInDomain",
 		samr_dissect_enum_dom_aliases_rqst,
 		samr_dissect_enum_dom_aliases_reply },
-        { SAMR_GET_ALIAS_MEMBERSHIP, "GetAliasMem",
+        { SAMR_GET_ALIAS_MEMBERSHIP, "SamrGetAliasMembership",
 		samr_dissect_get_alias_membership_rqst,
 		samr_dissect_get_alias_membership_reply },
-        { SAMR_LOOKUP_NAMES, "LookupNames",
+        { SAMR_LOOKUP_NAMES, "SamrLookupNamesInDomain",
 		samr_dissect_lookup_names_rqst,
 		samr_dissect_lookup_names_reply },
-        { SAMR_LOOKUP_RIDS, "LookupRIDs",
+        { SAMR_LOOKUP_RIDS, "SamrLookupIdsInDomain",
 		samr_dissect_lookup_rids_rqst,
 		samr_dissect_lookup_rids_reply },
-        { SAMR_OPEN_GROUP, "OpenGroup",
+        { SAMR_OPEN_GROUP, "SamrOpenGroup",
 		samr_dissect_open_group_rqst,
 		samr_dissect_open_group_reply },
-        { SAMR_QUERY_GROUPINFO, "QueryGroupInfo",
+        { SAMR_QUERY_GROUPINFO, "SamrQueryInformationGroup",
 		samr_dissect_query_information_group_rqst,
 		samr_dissect_query_information_group_reply },
-        { SAMR_SET_GROUPINFO, "SetGroupInfo",
+        { SAMR_SET_GROUPINFO, "SamrSetInformationGroup",
 		samr_dissect_set_information_group_rqst,
 		samr_dissect_set_information_group_reply },
-        { SAMR_ADD_GROUPMEM, "AddGroupMem",
+        { SAMR_ADD_GROUPMEM, "SamrAddMemberToGroup",
 		samr_dissect_add_member_to_group_rqst,
 		samr_dissect_add_member_to_group_reply },
-        { SAMR_DELETE_DOM_GROUP, "DeleteDomainGroup",
+        { SAMR_DELETE_DOM_GROUP, "SamrDeleteGroup",
 		samr_dissect_delete_dom_group_rqst,
 		samr_dissect_delete_dom_group_reply },
-        { SAMR_DEL_GROUPMEM, "RemoveGroupMem",
+        { SAMR_DEL_GROUPMEM, "SamrRemoveMemberFromGroup",
 		samr_dissect_remove_member_from_group_rqst,
 		samr_dissect_remove_member_from_group_reply },
-        { SAMR_QUERY_GROUPMEM, "QueryGroupMem",
+        { SAMR_QUERY_GROUPMEM, "SamrGetMembersInGroup",
 		samr_dissect_query_groupmem_rqst,
 		samr_dissect_query_groupmem_reply },
-        { SAMR_SET_MEMBER_ATTRIBUTES_OF_GROUP, "SetMemberAttrGroup",
+        { SAMR_SET_MEMBER_ATTRIBUTES_OF_GROUP, "SamrSetMemberAttributesOfGroup",
 		samr_dissect_set_member_attributes_of_group_rqst,
 		samr_dissect_set_member_attributes_of_group_reply },
-        { SAMR_OPEN_ALIAS, "OpenAlias",
+        { SAMR_OPEN_ALIAS, "SamrOpenAlias",
 		samr_dissect_open_alias_rqst,
 		samr_dissect_open_alias_reply },
-        { SAMR_QUERY_ALIASINFO, "QueryAliasInfo",
+        { SAMR_QUERY_ALIASINFO, "SamrQueryInformationAlias",
 		samr_dissect_query_information_alias_rqst,
 		samr_dissect_query_information_alias_reply },
-        { SAMR_SET_ALIASINFO, "SetAliasInfo",
+        { SAMR_SET_ALIASINFO, "SamrSetInformationAlias",
 		samr_dissect_set_information_alias_rqst,
 		samr_dissect_set_information_alias_reply },
-        { SAMR_DELETE_DOM_ALIAS, "DeleteAlias",
+        { SAMR_DELETE_DOM_ALIAS, "SamrDeleteAlias",
 		samr_dissect_delete_dom_alias_rqst,
 		samr_dissect_delete_dom_alias_reply },
-        { SAMR_ADD_ALIASMEM, "AddAliasMem",
+        { SAMR_ADD_ALIASMEM, "SamrAddMemberToAlias",
 		samr_dissect_add_alias_member_rqst,
 		samr_dissect_add_alias_member_reply },
-        { SAMR_DEL_ALIASMEM, "RemoveAliasMem",
+        { SAMR_DEL_ALIASMEM, "SamrRemoveMemberFromAlias",
 		samr_dissect_remove_alias_member_rqst,
 		samr_dissect_remove_alias_member_reply },
-        { SAMR_GET_MEMBERS_IN_ALIAS, "GetAliasMem",
+        { SAMR_GET_MEMBERS_IN_ALIAS, "SamrGetMembersInAlias",
 		samr_dissect_get_members_in_alias_rqst,
 		samr_dissect_get_members_in_alias_reply },
-        { SAMR_OPEN_USER, "OpenUser",
+        { SAMR_OPEN_USER, "SamrOpenUser",
 		samr_dissect_open_user_rqst,
 		samr_dissect_open_user_reply },
-        { SAMR_DELETE_DOM_USER, "DeleteUser",
+        { SAMR_DELETE_DOM_USER, "SamrDeleteUser",
 		samr_dissect_delete_dom_user_rqst,
 		samr_dissect_delete_dom_user_reply },
-        { SAMR_QUERY_USERINFO, "QueryUserInfo",
+        { SAMR_QUERY_USERINFO, "SamrQueryInformationUser",
 		samr_dissect_query_information_user_rqst,
 		samr_dissect_query_information_user_reply },
-        { SAMR_SET_USERINFO2, "SetUserInfo2",
+        { SAMR_SET_USERINFO2, "SamrSetInformationUser2",
 		samr_dissect_set_information_user2_rqst,
 		samr_dissect_set_information_user2_reply },
-	{ SAMR_CHANGE_PASSWORD_USER, "ChangePassword",
+	{ SAMR_CHANGE_PASSWORD_USER, "SamrChangePasswordUser",
 		samr_dissect_change_password_user_rqst,
 		samr_dissect_change_password_user_reply },
-        { SAMR_GET_GROUPS_FOR_USER, "GetGroups",
+        { SAMR_GET_GROUPS_FOR_USER, "SamrGetGroupsForUser",
 		samr_dissect_get_groups_for_user_rqst,
 		samr_dissect_get_groups_for_user_reply },
-        { SAMR_QUERY_DISPINFO, "QueryDispinfo",
+        { SAMR_QUERY_DISPINFO, "SamrQueryDisplayInformation",
 		samr_dissect_query_dispinfo_rqst,
 		samr_dissect_query_dispinfo_reply },
-        { SAMR_GET_DISPLAY_ENUMERATION_INDEX, "GetDispEnumNDX",
+        { SAMR_GET_DISPLAY_ENUMERATION_INDEX, "SamrGetDisplayEnumerationIndex",
 		samr_dissect_get_display_enumeration_index_rqst,
 		samr_dissect_get_display_enumeration_index_reply },
-        { SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN, "TestPrivateFnsDomain",
+        { SAMR_TEST_PRIVATE_FUNCTIONS_DOMAIN, "SamrTestPrivateFunctionsDomain",
 		samr_dissect_test_private_fns_domain_rqst,
 		samr_dissect_test_private_fns_domain_reply },
-        { SAMR_TEST_PRIVATE_FUNCTIONS_USER, "TestPrivateFnsUser",
+        { SAMR_TEST_PRIVATE_FUNCTIONS_USER, "SamrTestPrivateFunctionsUser",
 		samr_dissect_test_private_fns_user_rqst,
 		samr_dissect_test_private_fns_user_reply },
-        { SAMR_GET_USRDOM_PWINFO, "GetUserDomPwInfo",
+        { SAMR_GET_USRDOM_PWINFO, "SamrGetUserDomainPasswordInformation",
 		samr_dissect_get_usrdom_pwinfo_rqst,
 		samr_dissect_get_usrdom_pwinfo_reply },
-        { SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN, "RemoveMemberForeignDomain",
+        { SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN, "SamrRemoveMemberFromForeignDomain",
 		samr_dissect_remove_member_from_foreign_domain_rqst,
 		samr_dissect_remove_member_from_foreign_domain_reply },
-        { SAMR_QUERY_INFORMATION_DOMAIN2, "QueryDomInfo2",
+        { SAMR_QUERY_INFORMATION_DOMAIN2, "SamrQueryInformationDomain2",
 		samr_dissect_query_information_domain_rqst,
 		samr_dissect_query_information_domain_reply },
-        { SAMR_UNKNOWN_2f, "Unknown 0x2f",
-		samr_dissect_unknown_2f_rqst,
-		samr_dissect_unknown_2f_reply },
+        { SAMR_QUERY_INFORMATION_USER2, "SamrQueryInformationUser2",
+		samr_dissect_query_information_user2_rqst,
+		samr_dissect_query_information_user2_reply },
         { SAMR_QUERY_DISPINFO2, "QueryDispinfo2",
 		samr_dissect_query_dispinfo_rqst,
 		samr_dissect_query_dispinfo_reply },
-        { SAMR_GET_DISPLAY_ENUMERATION_INDEX2, "GetDispEnumNDX2",
+        { SAMR_GET_DISPLAY_ENUMERATION_INDEX2, "SamrGetDisplayEnumerationIndex2",
 		samr_dissect_get_display_enumeration_index2_rqst,
 		samr_dissect_get_display_enumeration_index2_reply },
-        { SAMR_CREATE_USER2_IN_DOMAIN, "CreateUser2",
+        { SAMR_CREATE_USER2_IN_DOMAIN, "SamrCreateUser2InDomain",
 		samr_dissect_create_user2_in_domain_rqst,
 		samr_dissect_create_user2_in_domain_reply },
-        { SAMR_QUERY_DISPINFO3, "QueryDispinfo3",
+        { SAMR_QUERY_DISPINFO3, "SamrQueryDisplayInformation3",
 		samr_dissect_query_dispinfo_rqst,
 		samr_dissect_query_dispinfo_reply },
-        { SAMR_ADD_MULTIPLE_MEMBERS_TO_ALIAS, "AddAliasMemMultiple",
+        { SAMR_ADD_MULTIPLE_MEMBERS_TO_ALIAS, "SamrAddMultipleMembersToAlias",
 		samr_dissect_add_multiple_members_to_alias_rqst,
 		samr_dissect_add_multiple_members_to_alias_reply },
-        { SAMR_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS, "RemoveAliasMemMultiple",
+        { SAMR_REMOVE_MULTIPLE_MEMBERS_FROM_ALIAS, "SamrRemoveMultipleMembersFromAlias",
 		samr_dissect_remove_multiple_members_from_alias_rqst,
 		samr_dissect_remove_multiple_members_from_alias_reply },
-        { SAMR_OEM_CHANGE_PASSWORD_USER2, "OEMChangePassword2",
+        { SAMR_OEM_CHANGE_PASSWORD_USER2, "SamrOemChangePasswordUser2",
 		samr_dissect_oem_change_password_user2_rqst,
 		samr_dissect_oem_change_password_user2_reply },
-        { SAMR_UNICODE_CHANGE_PASSWORD_USER2, "UnicodeChangePassword2",
+        { SAMR_UNICODE_CHANGE_PASSWORD_USER2, "SamrUnicodeChangePasswordUser2",
 		samr_dissect_unicode_change_password_user2_rqst,
 		samr_dissect_unicode_change_password_user2_reply },
-        { SAMR_GET_DOM_PWINFO, "GetDomainPasswordInfo",
+        { SAMR_GET_DOM_PWINFO, "SamrGetDomainPasswordInformation",
 		samr_dissect_get_domain_password_information_rqst,
 		samr_dissect_get_domain_password_information_reply },
-	{ SAMR_CONNECT2, "Connect2",
+	{ SAMR_CONNECT2, "SamrConnect2",
 		samr_dissect_connect2_rqst,
 		samr_dissect_connect2_reply },
-        { SAMR_SET_USERINFO, "SetUserInfo",
+        { SAMR_SET_USERINFO, "SamrSetInformationUser",
 		samr_dissect_set_information_user2_rqst,
 		samr_dissect_set_information_user2_reply },
-        { SAMR_UNKNOWN_3B, "Unknown 0x3b",
-		samr_dissect_unknown_3b_rqst,
-		samr_dissect_unknown_3b_reply },
-        { SAMR_UNKNOWN_3C, "Unknown 0x3c",
-		samr_dissect_unknown_3c_rqst,
-		samr_dissect_unknown_3c_reply },
-	{ SAMR_CONNECT4, "Connect4",
+        { SAMR_SET_BOOT_KEY_INFORMATION, "SamrSetBootKeyInformation",
+		samr_dissect_set_boot_key_information_rqst,
+		samr_dissect_set_boot_key_information_reply },
+        { SAMR_GET_BOOT_KEY_INFORMATION, "SamrGetBootKeyInformation",
+		samr_dissect_get_boot_key_information_rqst,
+		samr_dissect_get_boot_key_information_reply },
+	{ SAMR_CONNECT3, "SamrConnect3",
+		samr_dissect_connect4_rqst,
+		samr_dissect_connect2_reply },
+	{ SAMR_CONNECT4, "SamrConnect4",
 		samr_dissect_connect4_rqst,
 		samr_dissect_connect2_reply },
         {0, NULL, NULL,  NULL }
diff --git a/packet-dcerpc-samr.h b/packet-dcerpc-samr.h
index 6310ba11fa..5ee27c2efe 100644
--- a/packet-dcerpc-samr.h
+++ b/packet-dcerpc-samr.h
@@ -2,7 +2,7 @@
  * Routines for SMB \PIPE\samr packet disassembly
  * Copyright 2001, Tim Potter <tpot@samba.org>
  *
- * $Id: packet-dcerpc-samr.h,v 1.10 2003/07/24 20:33:22 guy Exp $
+ * $Id: packet-dcerpc-samr.h,v 1.11 2003/09/23 12:06:20 sahlberg Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -75,7 +75,7 @@
 #define SAMR_GET_USRDOM_PWINFO 0x2c
 #define SAMR_REMOVE_MEMBER_FROM_FOREIGN_DOMAIN     0x2d
 #define SAMR_QUERY_INFORMATION_DOMAIN2    0x2e
-#define SAMR_UNKNOWN_2f        0x2f
+#define SAMR_QUERY_INFORMATION_USER2        0x2f
 #define SAMR_QUERY_DISPINFO2   0x30
 #define SAMR_GET_DISPLAY_ENUMERATION_INDEX2        0x31
 #define SAMR_CREATE_USER2_IN_DOMAIN       0x32
@@ -87,8 +87,8 @@
 #define SAMR_GET_DOM_PWINFO    0x38
 #define SAMR_CONNECT2          0x39
 #define SAMR_SET_USERINFO      0x3A
-#define SAMR_UNKNOWN_3B	       0x3B
-#define SAMR_UNKNOWN_3C	       0x3C
+#define SAMR_SET_BOOT_KEY_INFORMATION	       0x3B
+#define SAMR_GET_BOOT_KEY_INFORMATION	       0x3C
 #define SAMR_CONNECT3          0x3D
 #define SAMR_CONNECT4          0x3E