diff --git a/Public/Add-RabbitMQExchange.ps1 b/Public/Add-RabbitMQExchange.ps1
index 3bfd45f..c323309 100644
--- a/Public/Add-RabbitMQExchange.ps1
+++ b/Public/Add-RabbitMQExchange.ps1
@@ -124,7 +124,7 @@ function Add-RabbitMQExchange
 
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($n))"
+                $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($n))"
                 Write-Verbose "Invoking REST API: $url"
         
                 $result = Invoke-RestMethod $url -Credential $Credentials -AllowEscapedDotsAndSlashes -DisableKeepAlive:$InvokeRestMethodKeepAlive -ErrorAction Continue -Method Put -ContentType "application/json" -Body $bodyJson
diff --git a/Public/Add-RabbitMQExchangeBinding.ps1 b/Public/Add-RabbitMQExchangeBinding.ps1
index d52cb1a..a7f1675 100644
--- a/Public/Add-RabbitMQExchangeBinding.ps1
+++ b/Public/Add-RabbitMQExchangeBinding.ps1
@@ -91,7 +91,7 @@ function Add-RabbitMQExchangeBinding
         {
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/bindings/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/e/$([System.Web.HttpUtility]::UrlEncode($ExchangeName))/e/$([System.Web.HttpUtility]::UrlEncode($Name))"
+                $url = Join-Parts $BaseUri "/api/bindings/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/e/$([System.Uri]::EscapeDataString($ExchangeName))/e/$([System.Uri]::EscapeDataString($Name))"
                 Write-Verbose "Invoking REST API: $url"
 
                 $body = @{
diff --git a/Public/Add-RabbitMQMessage.ps1 b/Public/Add-RabbitMQMessage.ps1
index 968aa21..2af3df1 100644
--- a/Public/Add-RabbitMQMessage.ps1
+++ b/Public/Add-RabbitMQMessage.ps1
@@ -80,7 +80,7 @@ function Add-RabbitMQMessage
     {
         if ($pscmdlet.ShouldProcess("server: $BaseUri/$VirtualHost", "Publish message to exchange $ExchangeName with routing key $RoutingKey"))
         {
-            $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($ExchangeName))/publish"
+            $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($ExchangeName))/publish"
             Write-Verbose "Invoking REST API: $url"
 
             $body = @{
diff --git a/Public/Add-RabbitMQQueue.ps1 b/Public/Add-RabbitMQQueue.ps1
index ce202c5..92d7df0 100644
--- a/Public/Add-RabbitMQQueue.ps1
+++ b/Public/Add-RabbitMQQueue.ps1
@@ -103,7 +103,7 @@ function Add-RabbitMQQueue
         {
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($n))"
+                $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($n))"
                 Write-Verbose "Invoking REST API: $url"
 
                 $body = @{}
diff --git a/Public/Add-RabbitMQQueueBinding.ps1 b/Public/Add-RabbitMQQueueBinding.ps1
index 40e82bb..77ade1c 100644
--- a/Public/Add-RabbitMQQueueBinding.ps1
+++ b/Public/Add-RabbitMQQueueBinding.ps1
@@ -91,7 +91,7 @@ function Add-RabbitMQQueueBinding
         {
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/bindings/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/e/$([System.Web.HttpUtility]::UrlEncode($ExchangeName))/q/$([System.Web.HttpUtility]::UrlEncode($Name))"
+                $url = Join-Parts $BaseUri "/api/bindings/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/e/$([System.Uri]::EscapeDataString($ExchangeName))/q/$([System.Uri]::EscapeDataString($Name))"
                 Write-Verbose "Invoking REST API: $url"
 
                 $body = @{
diff --git a/Public/Clear-RabbitMQQueue.ps1 b/Public/Clear-RabbitMQQueue.ps1
index 8cf4acc..618773a 100644
--- a/Public/Clear-RabbitMQQueue.ps1
+++ b/Public/Clear-RabbitMQQueue.ps1
@@ -58,7 +58,7 @@ function Clear-RabbitMQQueue
     {
         if ($pscmdlet.ShouldProcess("server: $BaseUri/$VirtualHost", "purge queue $Name"))
         {
-            $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($Name))/contents"
+            $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($Name))/contents"
             Write-Verbose "Invoking REST API: $url"
 
             $result = Invoke-RestMethod $url -Credential $Credentials -AllowEscapedDotsAndSlashes -DisableKeepAlive:$InvokeRestMethodKeepAlive -ErrorAction Continue -Method Delete
diff --git a/Public/Get-RabbitMQMessage.ps1 b/Public/Get-RabbitMQMessage.ps1
index 0f54bc8..f4ce96d 100644
--- a/Public/Get-RabbitMQMessage.ps1
+++ b/Public/Get-RabbitMQMessage.ps1
@@ -113,7 +113,7 @@ function Get-RabbitMQMessage
         if ([bool]$Remove) { $s = "Messages will be removed from the queue." } else {$s = "Messages will be requeued."}
         if ($pscmdlet.ShouldProcess("server: $BaseUri/$VirtualHost", "Get $Count message(s) from queue $Name. $s"))
         {
-            $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($Name))/get"
+            $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($Name))/get"
             Write-Verbose "Invoking REST API: $url"
 
             $body = @{
diff --git a/Public/Get-RabbitMQQueueBinding.ps1 b/Public/Get-RabbitMQQueueBinding.ps1
index 4d06c78..763a5a6 100644
--- a/Public/Get-RabbitMQQueueBinding.ps1
+++ b/Public/Get-RabbitMQQueueBinding.ps1
@@ -91,7 +91,7 @@ function Get-RabbitMQQueueBinding
         {
             foreach ($n in $Name)
             {
-                $result = GetItemsFromRabbitMQApi -BaseUri $BaseUri $Credentials "queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($n))/bindings"
+                $result = GetItemsFromRabbitMQApi -BaseUri $BaseUri $Credentials "queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($n))/bindings"
 
                 $result | Add-Member -NotePropertyName "HostName" -NotePropertyValue $BaseUri
 
diff --git a/Public/Remove-RabbitMQExchange.ps1 b/Public/Remove-RabbitMQExchange.ps1
index 25a9431..f972b40 100644
--- a/Public/Remove-RabbitMQExchange.ps1
+++ b/Public/Remove-RabbitMQExchange.ps1
@@ -88,7 +88,7 @@ function Remove-RabbitMQExchange
         {
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($n))"
+                $url = Join-Parts $BaseUri "/api/exchanges/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($n))"
         
                 $result = Invoke-RestMethod $url -Credential $Credentials -AllowEscapedDotsAndSlashes -DisableKeepAlive:$InvokeRestMethodKeepAlive -ErrorAction Continue -Method Delete
 
diff --git a/Public/Remove-RabbitMQQueue.ps1 b/Public/Remove-RabbitMQQueue.ps1
index 7fc1f0a..ec09ef4 100644
--- a/Public/Remove-RabbitMQQueue.ps1
+++ b/Public/Remove-RabbitMQQueue.ps1
@@ -88,7 +88,7 @@ function Remove-RabbitMQQueue
         {
             foreach($n in $Name)
             {
-                $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Web.HttpUtility]::UrlEncode($n))"
+                $url = Join-Parts $BaseUri "/api/queues/$([System.Web.HttpUtility]::UrlEncode($VirtualHost))/$([System.Uri]::EscapeDataString($n))"
                 Write-Verbose "Invoking REST API: $url"
         
                 $result = Invoke-RestMethod $url -Credential $Credentials -AllowEscapedDotsAndSlashes -DisableKeepAlive:$InvokeRestMethodKeepAlive -ErrorAction Continue -Method Delete