diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 7ce47b9cd..04e6cf00f 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -374,7 +374,7 @@ class Contact extends BaseModule
 
 			if ($cmd === 'updateprofile' && ($orig_record['uid'] != 0)) {
 				self::updateContactFromProbe($contact_id);
-				DI::baseUrl()->redirect('crepair/' . $contact_id);
+				DI::baseUrl()->redirect('contact/' . $contact_id . '/advanced/');
 				// NOTREACHED
 			}
 
@@ -571,7 +571,6 @@ class Contact extends BaseModule
 				'$visit'          => DI::l10n()->t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
 				'$blockunblock'   => DI::l10n()->t('Block/Unblock contact'),
 				'$ignorecont'     => DI::l10n()->t('Ignore contact'),
-				'$lblcrepair'     => DI::l10n()->t('Repair URL settings'),
 				'$lblrecent'      => DI::l10n()->t('View conversations'),
 				'$lblsuggest'     => $lblsuggest,
 				'$nettype'        => $nettype,
@@ -910,7 +909,7 @@ class Contact extends BaseModule
 
 		if (!empty($contact['uid'])) {
 			$tabs[] = ['label' => DI::l10n()->t('Advanced'),
-				'url'   => 'crepair/' . $contact['id'],
+				'url'   => 'contact/' . $contact['id'] . '/advanced/',
 				'sel'   => (($active_tab == 6) ? 'active' : ''),
 				'title' => DI::l10n()->t('Advanced Contact Settings'),
 				'id'    => 'advanced-tab',
diff --git a/view/global.css b/view/global.css
index a50d10de4..9805a6154 100644
--- a/view/global.css
+++ b/view/global.css
@@ -486,13 +486,13 @@ aside .help-aside-wrapper h1 {
   opacity: 1.0;
 }
 
-.crepair-label {
+.contact-advanced-label {
   margin-top: 10px;
   float: left;
   width: 250px;
 }
 
-.crepair-input {
+.contact-advanced-input {
   margin-top: 10px;
   float: left;
   width: 200px;
@@ -549,7 +549,7 @@ td.pendingnote > p > span {
 }
 
 /* warning message */
-.crepair-error-message,
+.contact-advanced-error-message,
 .warning-message {
   padding: 10px;
   margin: 5px;
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index b30a7d4ed..f7b2d7ea1 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2650,29 +2650,29 @@ aside input[type='text'] {
 	margin-top: 15px;
 }
 
-#crepair-name-label,
-#crepair-nick-label,
-#crepair-attag-label,
-#crepair-url-label,
-#crepair-request-label,
-#crepair-confirm-label,
-#crepair-notification-label,
-#crepair-photo-label,
-#crepair-poll-label {
+#contact-advanced-name-label,
+#contact-advanced-nick-label,
+#contact-advanced-attag-label,
+#contact-advanced-url-label,
+#contact-advanced-request-label,
+#contact-advanced-confirm-label,
+#contact-advanced-notification-label,
+#contact-advanced-photo-label,
+#contact-advanced-poll-label {
 	float: left;
 	width: 200px;
 	margin-bottom: 15px;
 }
 
-#crepair-name,
-#crepair-nick,
-#crepair-attag,
-#crepair-url,
-#crepair-request,
-#crepair-confirm,
-#crepair-notify,
-#crepair-photo,
-#crepair-poll {
+#contact-advanced-name,
+#contact-advanced-nick,
+#contact-advanced-attag,
+#contact-advanced-url,
+#contact-advanced-request,
+#contact-advanced-confirm,
+#contact-advanced-notify,
+#contact-advanced-photo,
+#contact-advanced-poll {
 	float: left;
 	width: 300px;
 }
diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/contact/advanced.tpl
similarity index 82%
rename from view/theme/frio/templates/crepair.tpl
rename to view/theme/frio/templates/contact/advanced.tpl
index df4976200..30a2c4bea 100644
--- a/view/theme/frio/templates/crepair.tpl
+++ b/view/theme/frio/templates/contact/advanced.tpl
@@ -1,17 +1,17 @@
 
-<div id="crepair" class="generic-page-wrapper">
+<div id="contact-advanced" class="generic-page-wrapper">
 	{{include file="section_title.tpl"}}
 
 	{{$tab_str nofilter}}
 
-	<div class="crepair-error-message">{{$warning nofilter}}</div><br>
-	<div class="crepair-return">
+	<div class="contact-advanced-error-message">{{$warning nofilter}}</div><br>
+	<div class="contact-advanced-return">
 		{{$info nofilter}}<br>
 		<!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
 	</div>
 	<br />
 
-	<form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
+	<form id="contact-advanced-form" action="contact/{{$contact_id}}/advanced" method="post" >
 
 		<!-- <h4>{{$contact_name}}</h4> -->
 
diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 081f1710a..cc541fb87 100644
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -3170,13 +3170,13 @@ margin-left: 0px;
 	color: #efefef;
 }
 
-.crepair-label {
+.contact-advanced-label {
 	margin-top: 10px;
 	float: left;
 	width: 250px;
 }
 
-.crepair-input {
+.contact-advanced-input {
 	margin-top: 10px;
 	float: left;
 	width: 200px;