diff --git a/src/qjackctlJackConnect.cpp b/src/qjackctlJackConnect.cpp
index bbd4ddf2..7efd57cd 100644
--- a/src/qjackctlJackConnect.cpp
+++ b/src/qjackctlJackConnect.cpp
@@ -131,9 +131,9 @@ void qjackctlJackPort::updatePortName ( bool bRename )
 		if (pJackPort) {
 			jack_uuid_t port_uuid = ::jack_port_uuid(pJackPort);
 			const QString& sPrettyName = prettyName(port_uuid);
-			if (sPortNameEx != sPortName || sPortNameEx != sPrettyName) {
-				if (sPrettyName.isEmpty() || sPortNameEx != sPortName || bRename) {
-					removePrettyName(pJackClient, port_uuid);
+			if (sPortNameEx != sPortName && sPortNameEx != sPrettyName) {
+				if (sPrettyName.isEmpty() || bRename) {
+					setPrettyName(pJackClient, port_uuid, sPortNameEx);
 				} else {
 					sPortNameEx = sPrettyName;
 					setPortNameAlias(sPortNameEx);
@@ -247,9 +247,9 @@ void qjackctlJackClient::updateClientName ( bool bRename )
 			jack_uuid_t client_uuid = 0;
 			::jack_uuid_parse(pszClientUuid, &client_uuid);
 			const QString& sPrettyName = prettyName(client_uuid);
-			if (sClientNameEx != sClientName || sClientNameEx != sPrettyName) {
-				if (sPrettyName.isEmpty() || sClientNameEx != sClientName || bRename) {
-					removePrettyName(pJackClient, client_uuid);
+			if (sClientNameEx != sClientName && sClientNameEx != sPrettyName) {
+				if (sPrettyName.isEmpty() || bRename) {
+					setPrettyName(pJackClient, client_uuid, sClientNameEx);
 				} else {
 					sClientNameEx = sPrettyName;
 					setClientNameAlias(sClientNameEx);