diff --git a/asn1/p1/packet-p1-template.c b/asn1/p1/packet-p1-template.c
index 47119fb506..87c4f336e0 100644
--- a/asn1/p1/packet-p1-template.c
+++ b/asn1/p1/packet-p1-template.c
@@ -107,13 +107,13 @@ static void set_do_address(asn1_ctx_t* actx, gboolean do_address)
 	ctx->do_address = do_address;
 }
 
-static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx)
+static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
 {
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
 	if (ctx && ctx->do_address) {
-		if (address) {
-			ep_strbuf_append(ctx->oraddress, address);
+		if (addr) {
+			ep_strbuf_append(ctx->oraddress, addr);
 		}
 		if (tvb_string) {
 			ep_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
@@ -122,23 +122,23 @@ static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* ac
 
 }
 
-static void do_address_str(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx)
+static void do_address_str(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
 {
 	emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
-	do_address(address, tvb_string, actx);
+	do_address(addr, tvb_string, actx);
 
 	if (ctx && ctx->do_address && ddatype && tvb_string)
 		ep_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
 }
 
-static void do_address_str_tree(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree)
+static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree)
 {
 	emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
-	do_address(address, tvb_string, actx);
+	do_address(addr, tvb_string, actx);
 
 	if (ctx && ctx->do_address && tvb_string && ddatype) {
 		if (ddatype->len > 0) {
@@ -178,7 +178,7 @@ void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean
 	ctx->report_unknown_content_type = report_unknown_cont_type;
 }
 
-char* p1_get_last_oraddress (asn1_ctx_t* actx)
+const char* p1_get_last_oraddress (asn1_ctx_t* actx)
 {
 	p1_address_ctx_t* ctx;
 
diff --git a/asn1/p1/packet-p1-template.h b/asn1/p1/packet-p1-template.h
index 6bd9d14858..9b1262dec6 100644
--- a/asn1/p1/packet-p1-template.h
+++ b/asn1/p1/packet-p1-template.h
@@ -29,7 +29,7 @@
 #include "packet-p1-val.h"
 
 void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type);
-char* p1_get_last_oraddress(asn1_ctx_t* actx);
+const char* p1_get_last_oraddress(asn1_ctx_t* actx);
 void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
 #include "packet-p1-exp.h"
 
diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf
index f94a4a1c5e..239a199877 100644
--- a/asn1/p7/p7.cnf
+++ b/asn1/p7/p7.cnf
@@ -366,7 +366,7 @@ RTSE-apdus	B	"2.6.0.2.10""id-as-ms-rtse"
 
 
 #.FN_BODY	MSBindArgument/initiator-name
-	char *ora = NULL;
+	const char *ora = NULL;
 
 	%(DEFAULT_BODY)s
 
diff --git a/epan/dissectors/packet-p1.c b/epan/dissectors/packet-p1.c
index 88eda44b7c..3db843f2c3 100644
--- a/epan/dissectors/packet-p1.c
+++ b/epan/dissectors/packet-p1.c
@@ -915,13 +915,13 @@ static void set_do_address(asn1_ctx_t* actx, gboolean do_address)
 	ctx->do_address = do_address;
 }
 
-static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx)
+static void do_address(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
 {
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
 	if (ctx && ctx->do_address) {
-		if (address) {
-			ep_strbuf_append(ctx->oraddress, address);
+		if (addr) {
+			ep_strbuf_append(ctx->oraddress, addr);
 		}
 		if (tvb_string) {
 			ep_strbuf_append(ctx->oraddress, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
@@ -930,23 +930,23 @@ static void do_address(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* ac
 
 }
 
-static void do_address_str(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx)
+static void do_address_str(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx)
 {
 	emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
-	do_address(address, tvb_string, actx);
+	do_address(addr, tvb_string, actx);
 
 	if (ctx && ctx->do_address && ddatype && tvb_string)
 		ep_strbuf_append(ddatype, tvb_format_text(tvb_string, 0, tvb_length(tvb_string)));
 }
 
-static void do_address_str_tree(const char* address, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree)
+static void do_address_str_tree(const char* addr, tvbuff_t* tvb_string, asn1_ctx_t* actx, proto_tree* tree)
 {
 	emem_strbuf_t *ddatype = (emem_strbuf_t *)actx->value_ptr;
 	p1_address_ctx_t* ctx = (p1_address_ctx_t*)actx->subtree.tree_ctx;
 
-	do_address(address, tvb_string, actx);
+	do_address(addr, tvb_string, actx);
 
 	if (ctx && ctx->do_address && tvb_string && ddatype) {
 		if (ddatype->len > 0) {
@@ -8299,7 +8299,7 @@ void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean
 	ctx->report_unknown_content_type = report_unknown_cont_type;
 }
 
-char* p1_get_last_oraddress (asn1_ctx_t* actx)
+const char* p1_get_last_oraddress (asn1_ctx_t* actx)
 {
 	p1_address_ctx_t* ctx;
 
diff --git a/epan/dissectors/packet-p1.h b/epan/dissectors/packet-p1.h
index ed8af9bd62..3d3d88c2b0 100644
--- a/epan/dissectors/packet-p1.h
+++ b/epan/dissectors/packet-p1.h
@@ -175,7 +175,7 @@
 #line 30 "../../asn1/p1/packet-p1-template.h"
 
 void p1_initialize_content_globals (asn1_ctx_t* actx, proto_tree *tree, gboolean report_unknown_cont_type);
-char* p1_get_last_oraddress(asn1_ctx_t* actx);
+const char* p1_get_last_oraddress(asn1_ctx_t* actx);
 void dissect_p1_mts_apdu (tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree);
 
 /*--- Included file: packet-p1-exp.h ---*/
diff --git a/epan/dissectors/packet-p7.c b/epan/dissectors/packet-p7.c
index db7e443ef0..430968c8b7 100644
--- a/epan/dissectors/packet-p7.c
+++ b/epan/dissectors/packet-p7.c
@@ -941,7 +941,7 @@ dissect_p7_MessageGroupName(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 
 static int
 dissect_p7_T_initiator_name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-	char *ora = NULL;
+	const char *ora = NULL;
 
 	  offset = dissect_p1_ORAddressAndOrDirectoryName(implicit_tag, tvb, offset, actx, tree, hf_index);