From 5e1210bb0df8be4855024d4653630c46200f95a5 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sat, 31 Jul 2021 14:53:20 +0200
Subject: [PATCH] security/acme-client: rename to "ACME Client", refs #2361

---
 security/acme-client/Makefile                        |  2 +-
 security/acme-client/pkg-descr                       |  1 +
 .../src/etc/inc/plugins.inc.d/acmeclient.inc         |  4 ++--
 .../OPNsense/AcmeClient/Api/SettingsController.php   | 10 +++++-----
 .../OPNsense/AcmeClient/forms/dialogCertificate.xml  |  8 ++++----
 .../OPNsense/AcmeClient/forms/dialogValidation.xml   |  6 +++---
 .../OPNsense/AcmeClient/forms/settings.xml           |  4 ++--
 .../app/library/OPNsense/AcmeClient/LeAccount.php    |  4 ++--
 .../OPNsense/AcmeClient/LeAutomationInterface.php    |  4 ++--
 .../library/OPNsense/AcmeClient/LeCertificate.php    | 12 ++++++------
 .../mvc/app/library/OPNsense/AcmeClient/LeCommon.php |  2 +-
 .../OPNsense/AcmeClient/LeValidationInterface.php    |  4 ++--
 .../mvc/app/models/OPNsense/AcmeClient/ACL/ACL.xml   |  6 +++---
 .../app/models/OPNsense/AcmeClient/AcmeClient.xml    |  2 +-
 .../mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml |  5 ++---
 .../mvc/app/views/OPNsense/AcmeClient/accounts.volt  |  4 ++--
 .../opnsense/scripts/OPNsense/AcmeClient/lecert.php  |  8 ++++----
 .../service/conf/actions.d/actions_acmeclient.conf   |  2 +-
 .../OPNsense/AcmeClient/lighttpd-acme-challenge.conf |  2 +-
 19 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/security/acme-client/Makefile b/security/acme-client/Makefile
index 97ee0b6ea..de8023fa3 100644
--- a/security/acme-client/Makefile
+++ b/security/acme-client/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		acme-client
 PLUGIN_VERSION=		2.6
-PLUGIN_COMMENT=		Let's Encrypt client
+PLUGIN_COMMENT=		ACME Client
 PLUGIN_MAINTAINER=	opnsense@moov.de
 PLUGIN_DEPENDS=		acme.sh py${PLUGIN_PYTHON}-dns-lexicon
 
diff --git a/security/acme-client/pkg-descr b/security/acme-client/pkg-descr
index b6dc6e05e..101894d32 100644
--- a/security/acme-client/pkg-descr
+++ b/security/acme-client/pkg-descr
@@ -14,6 +14,7 @@ Added:
 * add support for new ACME CA's: buypass, buypass_test, sslcom, zerossl (#2361)
 
 Changed:
+* rename plugin from "Let's Encrypt client" to "ACME Client" (#2361)
 * rename "Let's Encrypt Environment" to "ACME CA" (#2361)
 * preserve old LE accounts/certs by adding a compatibility layer (#2361)
 
diff --git a/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc b/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
index 801a1fb07..92b8881e2 100644
--- a/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
+++ b/security/acme-client/src/etc/inc/plugins.inc.d/acmeclient.inc
@@ -1,7 +1,7 @@
 <?php
 
 /**
- *    Copyright (C) 2017 Frank Wall
+ *    Copyright (C) 2017-2021 Frank Wall
  *    All rights reserved.
  *
  *    Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ function acmeclient_services()
     }
 
     $services[] = array(
-        'description' => gettext('Let\'s Encrypt client'),
+        'description' => gettext('ACME client'),
         'pidfile' => '/var/run/lighttpd-acme-challenge.pid',
         'configd' => array(
             'restart' => array('acme-http-challenge restart'),
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php
index 3dee7cfb2..c8bef9805 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/Api/SettingsController.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- *    Copyright (C) 2017 Frank Wall
+ *    Copyright (C) 2017-2021 Frank Wall
  *    Copyright (C) 2015 Deciso B.V.
  *
  *    All rights reserved.
@@ -263,7 +263,7 @@ class SettingsController extends ApiMutableModelControllerBase
                     // Add a new HAProxy ACL
                     $acl_uuid = $mdlHAProxy->newAcl(
                         "find_acme_challenge",
-                        "Added by Let's Encrypt plugin",
+                        "Added by ACME Client plugin",
                         "path_beg",
                         "0",
                         array("path_beg" => "/.well-known/acme-challenge/")
@@ -273,7 +273,7 @@ class SettingsController extends ApiMutableModelControllerBase
                     $backend_uuid = $mdlHAProxy->newBackend(
                         "1",
                         "acme_challenge_backend",
-                        "Added by Let's Encrypt plugin",
+                        "Added by ACME Client plugin",
                         "http",
                         "source",
                         "",
@@ -283,7 +283,7 @@ class SettingsController extends ApiMutableModelControllerBase
                     // Add a new HAProxy action
                     $action_uuid = $mdlHAProxy->newAction(
                         "redirect_acme_challenges",
-                        "Added by Let's Encrypt plugin",
+                        "Added by ACME Client plugin",
                         "if",
                         "",
                         "and",
@@ -298,7 +298,7 @@ class SettingsController extends ApiMutableModelControllerBase
                     // Add a new HAProxy server
                     $server_uuid = $mdlHAProxy->newServer(
                         "acme_challenge_host",
-                        "Added by Let's Encrypt plugin",
+                        "Added by ACME Client plugin",
                         "127.0.0.1",
                         $acme_port,
                         "active",
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
index ee0eb8daf..a78b2f051 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogCertificate.xml
@@ -27,24 +27,24 @@
         <type>select_multiple</type>
         <style>tokenize</style>
         <allownew>true</allownew>
-        <help><![CDATA[Configure additional names that should be part of the certificate, i.e. www.example.com or mail.example.com. Use TAB key to complete typing a FQDN.<br/><div class="text-info"><b>NOTE:</b>You need to forcefully re-issue the certificate if you change "Alt Names" after the certificate was signed by the Let's Encrypt Authority! Use the "issue" button in the Commands column in this case.</div>]]></help>
+        <help><![CDATA[Configure additional names that should be part of the certificate, i.e. www.example.com or mail.example.com. Use TAB key to complete typing a FQDN.<br/><div class="text-info"><b>NOTE:</b>You need to forcefully re-issue the certificate if you change "Alt Names" after the certificate was signed by the ACME CA! Use the "issue" button in the Commands column in this case.</div>]]></help>
         <hint>Enter FQDN here. Finish with TAB.</hint>
     </field>
     <field>
-        <label>Let's Encrypt Settings</label>
+        <label>ACME CA Settings</label>
         <type>header</type>
     </field>
     <field>
         <id>certificate.account</id>
         <label>LE Account</label>
         <type>dropdown</type>
-        <help><![CDATA[Set the Let's Encrypt account to use for this certificate.]]></help>
+        <help><![CDATA[Set the ACME CA account to use for this certificate.]]></help>
     </field>
     <field>
         <id>certificate.validationMethod</id>
         <label>Challenge Type</label>
         <type>dropdown</type>
-        <help><![CDATA[Set the Let's Encrypt challenge type for this certificate.]]></help>
+        <help><![CDATA[Set the ACME challenge type for this certificate.]]></help>
     </field>
     <field>
         <id>certificate.autoRenewal</id>
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
index 527601cfd..4faa6b778 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/dialogValidation.xml
@@ -21,7 +21,7 @@
         <id>validation.method</id>
         <label>Challenge Type</label>
         <type>dropdown</type>
-        <help>Set the Let's Encrypt challenge type. You'll have to add configuration for the selected challenge type below.</help>
+        <help>Set the ACME challenge type. You'll have to add configuration for the selected challenge type below.</help>
     </field>
     <field>
         <label>HTTP-01</label>
@@ -48,7 +48,7 @@
         <id>validation.http_opn_interface</id>
         <label>Interface</label>
         <type>dropdown</type>
-        <help><![CDATA[The FQDN's used in your certificate must currently point to an official IP address. Choose the interface where this IP address is currently configured. OPNsense will automatically create a temporary port forward to allow the Let's Encrypt validation to succeed. This will lead to a short downtime of the service that is normally used with this IP address.<br/><div class="text-info"><b>NOTE:</b>This will ONLY work if the official IP addresses are LOCALLY configured on your OPNsense firewall.</div>]]></help>
+        <help><![CDATA[The FQDN's used in your certificate must currently point to an official IP address. Choose the interface where this IP address is currently configured. OPNsense will automatically create a temporary port forward to allow the ACME validation to succeed. This will lead to a short downtime of the service that is normally used with this IP address.<br/><div class="text-info"><b>NOTE:</b>This will ONLY work if the official IP addresses are LOCALLY configured on your OPNsense firewall.</div>]]></help>
     </field>
     <field>
         <id>validation.http_opn_ipaddresses</id>
@@ -56,7 +56,7 @@
         <type>select_multiple</type>
         <style>tokenize</style>
         <allownew>true</allownew>
-        <help><![CDATA[The FQDN's used in your certificate must currently point to one or more official IP addresses. Enter the all of these IP addresses here. OPNsense will automatically create a temporary port forward to allow the Let's Encrypt validation to succeed. This will lead to a short downtime of the service that is normally used with these IP addresses.<br/><div class="text-info"><b>NOTE:</b>This will ONLY work if the official IP addresses are LOCALLY configured on your OPNsense firewall.</div>]]></help>
+        <help><![CDATA[The FQDN's used in your certificate must currently point to one or more official IP addresses. Enter the all of these IP addresses here. OPNsense will automatically create a temporary port forward to allow the ACME validation to succeed. This will lead to a short downtime of the service that is normally used with these IP addresses.<br/><div class="text-info"><b>NOTE:</b>This will ONLY work if the official IP addresses are LOCALLY configured on your OPNsense firewall.</div>]]></help>
         <hint>Enter IP addresses here. Finish each with TAB.</hint>
     </field>
     <field>
diff --git a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
index b72241e64..e5cea7414 100644
--- a/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
+++ b/security/acme-client/src/opnsense/mvc/app/controllers/OPNsense/AcmeClient/forms/settings.xml
@@ -3,7 +3,7 @@
         <id>acmeclient.settings.enabled</id>
         <label>Enable Plugin</label>
         <type>checkbox</type>
-        <help><![CDATA[Enable Let's Encrypt plugin.]]></help>
+        <help><![CDATA[Enable ACME client plugin.]]></help>
     </field>
     <field>
         <id>acmeclient.settings.autoRenewal</id>
@@ -33,7 +33,7 @@
         <id>acmeclient.settings.challengePort</id>
         <label>Local HTTP Port</label>
         <type>text</type>
-        <help><![CDATA[When using HTTP-01 as challenge type, a local webserver is used to provide acme challenge data to the Let's Encrypt servers. The local webserver is NOT directly exposed to the outside and should NOT use port 80 or any other well-known port. This setting allows you to change the local port of this webserver in case it interferes with another local service. Defaults to port 43580.]]></help>
+        <help><![CDATA[When using HTTP-01 as challenge type, a local webserver is used to provide acme challenge data to the ACME CA. The local webserver is NOT directly exposed to the outside and should NOT use port 80 or any other well-known port. This setting allows you to change the local port of this webserver in case it interferes with another local service. Defaults to port 43580.]]></help>
         <advanced>true</advanced>
     </field>
     <field>
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAccount.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAccount.php
index 5aa9e2ab2..ad172033c 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAccount.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAccount.php
@@ -31,7 +31,7 @@ namespace OPNsense\AcmeClient;
 use OPNsense\Core\Config;
 
 /**
- * Manage Let's Encrypt accounts with acme.sh
+ * Manage ACME CA accounts with acme.sh
  * @package OPNsense\AcmeClient
  */
 class LeAccount extends LeCommon
@@ -192,7 +192,7 @@ class LeAccount extends LeCommon
     }
 
     /**
-     * register account with Let's Encrypt
+     * register account with configured ACME CA
      * @return bool
      */
     public function register()
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomationInterface.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomationInterface.php
index 707b65aff..30607fd80 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomationInterface.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeAutomationInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2020 Frank Wall
+ * Copyright (C) 2020-2021 Frank Wall
  * Copyright (C) 2018 Deciso B.V.
  * All rights reserved.
  *
@@ -30,7 +30,7 @@
 namespace OPNsense\AcmeClient;
 
 /**
- * Interface for Let's Encrypt automations
+ * Interface for ACME Client automations
  * @package OPNsense\AcmeClient
  */
 interface LeAutomationInterface
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
index bc84d49b3..16fc4839a 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCertificate.php
@@ -37,7 +37,7 @@ use OPNsense\AcmeClient\LeAutomationFactory;
 use OPNsense\AcmeClient\LeValidationFactory;
 
 /**
- * Manage Let's Encrypt certificates with acme.sh
+ * Manage ACME certificates with acme.sh
  * @package OPNsense\AcmeClient
  */
 class LeCertificate extends LeCommon
@@ -169,7 +169,7 @@ class LeCertificate extends LeCommon
 
         // Collect required CA information
         $ca_cn = LeUtils::local_cert_get_cn($ca_content, false);
-        $ca['descr'] = (string)$ca_cn . ' (Let\'s Encrypt)';
+        $ca['descr'] = (string)$ca_cn . ' (ACME Client)';
 
         // Prepare CA for import
         LeUtils::local_ca_import($ca, $ca_content);
@@ -186,7 +186,7 @@ class LeCertificate extends LeCommon
             }
         } else {
             // Create new CA
-            LeUtils::log("importing Let's Encrypt CA: ${ca_cn}");
+            LeUtils::log("importing ACME CA: ${ca_cn}");
             $newca = Config::getInstance()->object()->addChild('ca');
             foreach (array_keys($ca) as $cacfg) {
                 $newca->addChild($cacfg, (string)$ca[$cacfg]);
@@ -251,7 +251,7 @@ class LeCertificate extends LeCommon
 
         // Collect required cert information
         $cert_cn = LeUtils::local_cert_get_cn($cert_content, false);
-        $cert['descr'] = (string)$cert_cn . ' (Let\'s Encrypt)';
+        $cert['descr'] = (string)$cert_cn . ' (ACME Client)';
         $cert['refid'] = $cert_refid;
 
         // Prepare certificate for import
@@ -277,7 +277,7 @@ class LeCertificate extends LeCommon
                 $newcert->addChild($certcfg, (string)$cert[$certcfg]);
             }
         }
-        LeUtils::log("${import_log_message} Let's Encrypt X.509 certificate: ${cert_cn}");
+        LeUtils::log("${import_log_message} ACME X.509 certificate: ${cert_cn}");
 
         /**
          * Step 3: update configuration
@@ -300,7 +300,7 @@ class LeCertificate extends LeCommon
     }
 
     /**
-     * check if certificate is already issued by Let's Encrypt
+     * check if certificate is already issued by ACME CA
      * @return bool
      */
     public function isIssued()
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCommon.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCommon.php
index 422a82508..f8d765bd3 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCommon.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeCommon.php
@@ -32,7 +32,7 @@ use OPNsense\Core\Config;
 use OPNsense\AcmeClient\LeUtils;
 
 /**
- * Common constants and functions for all Let's Encrypt classes
+ * Common constants and functions for all ACME classes
  * @package OPNsense\AcmeClient
  */
 abstract class LeCommon
diff --git a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidationInterface.php b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidationInterface.php
index 903486ffa..86c6be451 100644
--- a/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidationInterface.php
+++ b/security/acme-client/src/opnsense/mvc/app/library/OPNsense/AcmeClient/LeValidationInterface.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright (C) 2020 Frank Wall
+ * Copyright (C) 2020-2021 Frank Wall
  * Copyright (C) 2018 Deciso B.V.
  * All rights reserved.
  *
@@ -30,7 +30,7 @@
 namespace OPNsense\AcmeClient;
 
 /**
- * Interface for Let's Encrypt validation methods
+ * Interface for ACME validation methods
  * @package OPNsense\Backup
  */
 interface LeValidationInterface
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/ACL/ACL.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/ACL/ACL.xml
index 528fe599b..6800fe448 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/ACL/ACL.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/ACL/ACL.xml
@@ -1,9 +1,9 @@
 <acl>
-    <page-services-letsencrypt>
-        <name>Services: Let's Encrypt</name>
+    <page-services-acmeclient>
+        <name>Services: ACME Client</name>
         <patterns>
             <pattern>ui/acmeclient/*</pattern>
             <pattern>api/acmeclient/*</pattern>
         </patterns>
-    </page-services-letsencrypt>
+    </page-services-acmeclient>
 </acl>
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
index a105ce598..5f0c4fd6c 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/AcmeClient.xml
@@ -1,7 +1,7 @@
 <model>
     <mount>//OPNsense/AcmeClient</mount>
     <version>3.0.0</version>
-    <description>A secure Let's Encrypt plugin</description>
+    <description>A secure ACME Client plugin</description>
     <items>
         <settings>
             <enabled type="BooleanField">
diff --git a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
index 33a92cfb5..07b758fd0 100644
--- a/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
+++ b/security/acme-client/src/opnsense/mvc/app/models/OPNsense/AcmeClient/Menu/Menu.xml
@@ -1,7 +1,6 @@
 <menu>
     <Services>
-      <!-- using LE prefix for proper sorting -->
-      <LEAcmeClient VisibleName="Let's Encrypt" cssClass="fa fa-certificate fa-fw">
+      <AcmeClient VisibleName="ACME Client" cssClass="fa fa-certificate fa-fw">
           <Settings order="10" url="/ui/acmeclient">
               <General url="/ui/acmeclient#general-settings"/>
           </Settings>
@@ -13,6 +12,6 @@
               <SystemLog VisibleName="System Log" order="10" url="/ui/acmeclient/logs"/>
               <AcmeLog VisibleName="Acme Log" order="20" url="/ui/diagnostics/log/core/acmeclient"/>
           </Logs>
-      </LEAcmeClient>
+      </AcmeClient>
     </Services>
 </menu>
diff --git a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
index 7a95eef4b..212d76673 100644
--- a/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
+++ b/security/acme-client/src/opnsense/mvc/app/views/OPNsense/AcmeClient/accounts.volt
@@ -1,6 +1,6 @@
 {#
 
-Copyright (C) 2017 Frank Wall
+Copyright (C) 2017-2021 Frank Wall
 OPNsense® is Copyright © 2014-2015 by Deciso B.V.
 All rights reserved.
 
@@ -300,7 +300,7 @@ POSSIBILITY OF SUCH DAMAGE.
                 if (gridParams['register'] != undefined) {
                     var uuid=$(this).data("row-id");
                     stdDialogConfirm('{{ lang._('Confirmation Required') }}',
-                        '{{ lang._('Register the selected account with Lets Encrypt?') }}',
+                        '{{ lang._('Register the selected account with the configured ACME CA?') }}',
                         '{{ lang._('Yes') }}', '{{ lang._('Cancel') }}', function() {
                         ajaxCall(url=gridParams['register'] + uuid,sendData={},callback=function(data,status){
                             // reload grid afterwards
diff --git a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/lecert.php b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/lecert.php
index 3558d44dc..76fb546cf 100755
--- a/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/lecert.php
+++ b/security/acme-client/src/opnsense/scripts/OPNsense/AcmeClient/lecert.php
@@ -41,7 +41,7 @@ use OPNsense\AcmeClient\LeCertificate;
 const ABOUT = <<<TXT
 
 This script acts as a bridge between the OPNsense WebGUI/API and the
-acme.sh Let's Encrypt client.
+acme.sh ACME client.
 
 TXT;
 
@@ -66,7 +66,7 @@ const MODES = [
         'description' => 'run automations for the specified certificate',
     ],
     'register' => [
-        'description' => 'register the specified account with Lets Encrypt',
+        'description' => 'register the specified account with ACME CA',
     ],
 ];
 
@@ -76,7 +76,7 @@ const STATIC_OPTIONS = <<<TXT
 --mode              Specify the mode of operation
 --cert              The certificate UUID when working with a single certificate
 --all               Work with ALL enabled certificates
---account           The account UUID when working with an Lets Encrypt account
+--account           The account UUID when working with an ACME CA account
 --force             Force certain operations (i.e. renew)
 --cron              Special mode when running from cron (i.e. consider auto renew settings)
 TXT;
@@ -98,7 +98,7 @@ const EXAMPLES = <<<TXT
 - Completely remove a certificate (keeping the copy in Trust Store untouched)
   lecert.php --mode remove --cert 00000000-0000-0000-0000-000000000000
 
-- When registering a new account with Lets Encrypt
+- When registering a new account with ACME CA
   lecert.php --mode register --account 00000000-0000-0000-0000-000000000000
 TXT;
 
diff --git a/security/acme-client/src/opnsense/service/conf/actions.d/actions_acmeclient.conf b/security/acme-client/src/opnsense/service/conf/actions.d/actions_acmeclient.conf
index 81a14363b..8f379a6da 100644
--- a/security/acme-client/src/opnsense/service/conf/actions.d/actions_acmeclient.conf
+++ b/security/acme-client/src/opnsense/service/conf/actions.d/actions_acmeclient.conf
@@ -82,7 +82,7 @@ command:/usr/local/opnsense/scripts/OPNsense/AcmeClient/setup.sh; /usr/sbin/daem
 parameters:
 type:script
 message:cronjob running to sign or renew certificates
-description:Renew Let's Encrypt certificates
+description:Renew ACME certificates
 
 [register-account]
 command:/usr/local/opnsense/scripts/OPNsense/AcmeClient/lecert.php --mode register --account
diff --git a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
index c5746dddf..5f3cf31d2 100644
--- a/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
+++ b/security/acme-client/src/opnsense/service/templates/OPNsense/AcmeClient/lighttpd-acme-challenge.conf
@@ -21,7 +21,7 @@ server.max-keep-alive-idle = 30
 # server.virtual-* options
 server.document-root = "/var/empty"
 
-# Let's Encrypt acme challenges
+# ACME challenges
 alias.url += ( "/.well-known/acme-challenge/" => "/var/etc/acme-client/challenges/.well-known/acme-challenge/" )
 
 # Maximum idle time with nothing being written