diff --git a/cleanW10.ps1 b/cleanW10.ps1
index 6ab5c5c..f5265d5 100755
--- a/cleanW10.ps1
+++ b/cleanW10.ps1
@@ -10,8 +10,11 @@ Set-StrictMode -Version 2
 #$PSDefaultParameterValues=@{$dir = "./modules.d"}
 $HOST_FILE = "$env:windir\System32\drivers\etc\hosts"
 $HOST_IP = "0.0.0.0"
+$FW_RULE_NAME_PREFIX = "CleanW10"
+
 $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
+
 #Thanks to https://gist.github.com/markembling/173887
 function BlockHost {
     param(
@@ -66,14 +69,20 @@ function FwBlockOutputIP {
         foreach ($line in Get-Content $params.file ){ FwBlockOutputIP @{"ip"="$line"} }
     }
     elseif ( $params.ContainsKey('ip') ) {
-        Write-Host -NoNewline "`t$($params.ip) : "
-        if ( Get-NetFirewallRule -Name Blacklist_$($params.ip) -ErrorAction SilentlyContinue) {
-           Write-Host -ForegroundColor Yellow "already blacklisted"
+        if (-not $params.ContainsKey('name') -or $params.name -eq "" ) {
+           $name = $FW_RULE_NAME_PREFIX + "_IP_" + $params.ip
+        }
+        else {
+            $name = $FW_RULE_NAME_PREFIX + "_IP_" + $params.name
+        }
+        Write-Host -NoNewline "`tAdd FW IP rule $name ($($params.ip)) : " 
+        if ( Get-NetFirewallRule -Name $name -ErrorAction SilentlyContinue) {
+           Write-Host -ForegroundColor Yellow "already exist"
            return
         }
         else {
             Try {
-                New-NetFirewallRule -Name Blacklist_$($params.ip) -DisplayName "BlackList $($params.ip)" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress $params.ip -Action Block | Out-Null
+                New-NetFirewallRule -Name $name -DisplayName "$name (blacklist $($params.ip))" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress $params.ip -Action Block | Out-Null
             }
             Catch {
                 Write-Host -ForegroundColor Red "error"
@@ -100,29 +109,29 @@ function FwBlockProgram {
         [object]$params
     )
     if ( $params.ContainsKey('file') ) {
-        foreach ($line in Get-Content $params.file ){ FwBlockOutputIP @{"ip"="$line"} }
+        foreach ($line in Get-Content $params.file ){ FwBlockProgram @{"path"="$line"} }
     }
     elseif ( $params.ContainsKey('path') ) {
         $path = Invoke-Expression """$($params.path)"""
-        Write-Host -NoNewline "`tBlock program $($path) : "
+        if ( -not $params.ContainsKey('name') -or $params.name -eq "" ) {
+            $name = $FW_RULE_NAME_PREFIX + "_PROG_" + $params.path
+        }
+        $name = $FW_RULE_NAME_PREFIX + "_PROG_" + $params.name
+        Write-Host -NoNewline "`tAdd FW program rule $name ($($path)) : "
+        if ( Get-NetFirewallRule -Name $name -ErrorAction SilentlyContinue) {
+           Write-Host -ForegroundColor Yellow "already exist"
+           return
+        }
         if ( -not (Test-Path $path) ) {
             Write-Host -Foregroundcolor Red "Error (path not found)"
             return
         }
-        if ( -not $params.ContainsKey('name') ) {
-            $params.name = $params.path
-        }
-        if ( Get-NetFirewallRule -Name $($params.name) -ErrorAction SilentlyContinue) {
-           Write-Host -ForegroundColor Yellow "already blacklisted"
-           return
-        }
         try {
-            New-NetFirewallRule -Name "$($params.name)" -DisplayName "$($params.name)" -Program "$path" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress any -Action Block | Out-Null
+            New-NetFirewallRule -Name "$name" -DisplayName "$name (program : $($params.path))" -Program "$path" -Direction Outbound -Protocol any -Enabled True -Profile Any -RemoteAddress any -Action Block | Out-Null
             Write-Host -ForegroundColor Green "done"
         }
         catch {
             Write-Host -ForegroundColor Red "error"
-            return
         }
     }
     else {
@@ -368,7 +377,7 @@ function UninstallModernApp {
         }
         catch {
 	        Write-Host -NoNewLine -ForegroundColor Red "Error `n`t"
-            write-Host -ForegroundColor DarkRed "Impossible to Uninstall. Is this a system one."
+            write-Host -ForegroundColor DarkRed $_
         }
     }
     else {