ofbiz-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jler...@apache.org
Subject [ofbiz-framework] 01/02: Improved: replaces module by MODULE everywhere
Date Mon, 06 Apr 2020 10:05:34 GMT
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit ddb8f4273a28b1f465af65907b507ff6535a9d36
Author: Jacques Le Roux <jacques.le.roux@les7arts.com>
AuthorDate: Sun Apr 5 19:46:34 2020 +0200

    Improved: replaces module by MODULE everywhere
---
 .../java/org/apache/ofbiz/accounting/GlEvents.java |  10 +-
 .../accounting/agreement/AgreementServices.java    |   4 +-
 .../finaccount/FinAccountPaymentServices.java      |  88 ++--
 .../finaccount/FinAccountProductServices.java      |  24 +-
 .../accounting/finaccount/FinAccountServices.java  |  16 +-
 .../ofbiz/accounting/invoice/InvoiceServices.java  | 198 ++++-----
 .../ofbiz/accounting/invoice/InvoiceWorker.java    |  52 +--
 .../accounting/ledger/GeneralLedgerServices.java   |   4 +-
 .../accounting/payment/BillingAccountWorker.java   |   6 +-
 .../payment/GiftCertificateServices.java           | 100 ++---
 .../accounting/payment/PaymentGatewayServices.java | 322 +++++++--------
 .../accounting/payment/PaymentMethodServices.java  |  52 +--
 .../ofbiz/accounting/payment/PaymentWorker.java    |  18 +-
 .../ofbiz/accounting/period/PeriodServices.java    |   2 +-
 .../ofbiz/accounting/tax/TaxAuthorityServices.java |  26 +-
 .../authorizedotnet/AIMPaymentServices.java        |  66 +--
 .../clearcommerce/CCPaymentServices.java           |  20 +-
 .../thirdparty/clearcommerce/CCServicesTest.java   |  26 +-
 .../thirdparty/cybersource/IcsPaymentServices.java |  54 +--
 .../accounting/thirdparty/eway/EwayServices.java   |   8 +-
 .../thirdparty/eway/GatewayConnector.java          |   4 +-
 .../accounting/thirdparty/eway/GatewayRequest.java |   4 +-
 .../thirdparty/eway/GatewayResponse.java           |   4 +-
 .../thirdparty/gosoftware/PcChargeApi.java         |   6 +-
 .../thirdparty/gosoftware/PcChargeServices.java    |  22 +-
 .../accounting/thirdparty/gosoftware/RitaApi.java  |  12 +-
 .../thirdparty/gosoftware/RitaServices.java        |  30 +-
 .../thirdparty/orbital/OrbitalPaymentServices.java |  66 +--
 .../accounting/thirdparty/paypal/PayPalEvents.java |  64 +--
 .../thirdparty/paypal/PayPalServices.java          |  80 ++--
 .../thirdparty/sagepay/SagePayPaymentServices.java | 104 ++---
 .../thirdparty/sagepay/SagePayServices.java        |  60 +--
 .../accounting/thirdparty/sagepay/SagePayUtil.java |   6 +-
 .../securepay/SecurePayPaymentServices.java        |   6 +-
 .../thirdparty/securepay/SecurePayServiceTest.java |  34 +-
 .../thirdparty/valuelink/ValueLinkApi.java         | 122 +++---
 .../thirdparty/valuelink/ValueLinkServices.java    |  98 ++---
 .../accounting/thirdparty/verisign/PayflowPro.java |  72 ++--
 .../thirdparty/worldpay/WorldPayEvents.java        |  56 +--
 .../ofbiz/accounting/util/UtilAccounting.java      |   2 +-
 .../ofbiz/content/ContentManagementEvents.java     |  22 +-
 .../ofbiz/content/ContentManagementServices.java   | 130 +++---
 .../ofbiz/content/ContentManagementWorker.java     |   8 +-
 .../java/org/apache/ofbiz/content/ConvertTree.java |   8 +-
 .../apache/ofbiz/content/blog/BlogRssServices.java |  10 +-
 .../org/apache/ofbiz/content/cms/CmsEvents.java    |  38 +-
 .../ofbiz/content/compdoc/CompDocEvents.java       |  16 +-
 .../ofbiz/content/compdoc/CompDocServices.java     |  26 +-
 .../ofbiz/content/content/ContentEvents.java       |  14 +-
 .../ofbiz/content/content/ContentKeywordIndex.java |   8 +-
 .../ofbiz/content/content/ContentMapFacade.java    |  74 ++--
 .../content/content/ContentPermissionServices.java |   4 +-
 .../ofbiz/content/content/ContentSearch.java       |  22 +-
 .../ofbiz/content/content/ContentSearchEvents.java |   2 +-
 .../content/content/ContentSearchSession.java      |   8 +-
 .../ofbiz/content/content/ContentServices.java     |  24 +-
 .../content/content/ContentServicesComplex.java    |   4 +-
 .../ofbiz/content/content/ContentUrlFilter.java    |   8 +-
 .../ofbiz/content/content/ContentWorker.java       |  38 +-
 .../ofbiz/content/content/PermissionRecorder.java  |   4 +-
 .../content/content/UploadContentAndImage.java     |  50 +--
 .../org/apache/ofbiz/content/data/DataEvents.java  |  48 +--
 .../ofbiz/content/data/DataResourceWorker.java     |  22 +-
 .../apache/ofbiz/content/data/DataServices.java    |  72 ++--
 .../org/apache/ofbiz/content/ftp/FtpServices.java  |  14 +-
 .../apache/ofbiz/content/ftp/SecureFtpClient.java  |   2 +-
 .../apache/ofbiz/content/ftp/SimpleFtpClient.java  |   6 +-
 .../org/apache/ofbiz/content/ftp/SshFtpClient.java |   2 +-
 .../apache/ofbiz/content/layout/LayoutEvents.java  |  30 +-
 .../apache/ofbiz/content/layout/LayoutWorker.java  |   2 +-
 .../ofbiz/content/output/OutputServices.java       |  14 +-
 .../ofbiz/content/survey/PdfSurveyServices.java    |  32 +-
 .../apache/ofbiz/content/survey/SurveyEvents.java  |   6 +-
 .../apache/ofbiz/content/survey/SurveyWrapper.java |  34 +-
 .../content/view/SimpleContentViewHandler.java     |  20 +-
 .../webapp/ftl/CheckPermissionTransform.java       |   2 +-
 .../ftl/EditRenderSubContentCacheTransform.java    |   6 +-
 .../webapp/ftl/EditRenderSubContentTransform.java  |   6 +-
 .../webapp/ftl/InjectNodeTrailCsvTransform.java    |  12 +-
 .../ftl/LimitedSubContentCacheTransform.java       |   2 +-
 .../webapp/ftl/LoopSubContentTransform.java        |   4 +-
 .../webapp/ftl/OfbizContentAltUrlTransforms.java   |   4 +-
 .../webapp/ftl/RenderContentAndSubContent.java     |  10 +-
 .../content/webapp/ftl/RenderContentAsText.java    |  20 +-
 .../content/webapp/ftl/RenderContentTransform.java |   4 +-
 .../content/webapp/ftl/RenderSubContentAsText.java |  16 +-
 .../webapp/ftl/RenderSubContentCacheTransform.java |  12 +-
 .../webapp/ftl/RenderSubContentTransform.java      |   4 +-
 .../ftl/TraverseSubContentCacheTransform.java      |   2 +-
 .../webapp/ftl/TraverseSubContentTransform.java    |   6 +-
 .../webapp/ftl/WrapSubContentCacheTransform.java   |   6 +-
 .../org/apache/ofbiz/humanres/HumanResEvents.java  |  12 +-
 .../apache/ofbiz/manufacturing/bom/BOMHelper.java  |  10 +-
 .../apache/ofbiz/manufacturing/bom/BOMNode.java    |  22 +-
 .../ofbiz/manufacturing/bom/BOMServices.java       |  10 +-
 .../manufacturing/jobshopmgt/ProductionRun.java    |  18 +-
 .../jobshopmgt/ProductionRunEvents.java            |  10 +-
 .../jobshopmgt/ProductionRunHelper.java            |   4 +-
 .../jobshopmgt/ProductionRunServices.java          | 182 ++++----
 .../mrp/InventoryEventPlannedServices.java         |   4 +-
 .../ofbiz/manufacturing/mrp/MrpServices.java       |  26 +-
 .../ofbiz/manufacturing/mrp/ProposedOrder.java     |  26 +-
 .../manufacturing/routing/RoutingServices.java     |   2 +-
 .../manufacturing/techdata/TechDataServices.java   |  22 +-
 .../marketing/marketing/MarketingServices.java     |   6 +-
 .../ofbiz/marketing/report/ReportHelper.java       |   2 +-
 .../marketing/tracking/TrackingCodeEvents.java     |  60 +--
 .../java/org/apache/ofbiz/sfa/vcard/VCard.java     |   8 +-
 .../org/apache/ofbiz/order/OrderManagerEvents.java |  32 +-
 .../ofbiz/order/finaccount/FinAccountHelper.java   |  12 +-
 .../ofbiz/order/order/OrderChangeHelper.java       |  38 +-
 .../ofbiz/order/order/OrderContentWrapper.java     |   4 +-
 .../org/apache/ofbiz/order/order/OrderEvents.java  |   8 +-
 .../apache/ofbiz/order/order/OrderListState.java   |   4 +-
 .../ofbiz/order/order/OrderLookupServices.java     |  16 +-
 .../apache/ofbiz/order/order/OrderReadHelper.java  | 184 ++++-----
 .../ofbiz/order/order/OrderReturnServices.java     | 240 +++++------
 .../apache/ofbiz/order/order/OrderServices.java    | 458 ++++++++++-----------
 .../apache/ofbiz/order/quote/QuoteServices.java    |  12 +-
 .../order/requirement/RequirementServices.java     |  22 +-
 .../order/shoppingcart/CartEventListener.java      |  16 +-
 .../ofbiz/order/shoppingcart/CheckOutEvents.java   |  42 +-
 .../ofbiz/order/shoppingcart/CheckOutHelper.java   | 104 ++---
 .../ofbiz/order/shoppingcart/ShoppingCart.java     | 128 +++---
 .../order/shoppingcart/ShoppingCartEvents.java     | 102 ++---
 .../order/shoppingcart/ShoppingCartHelper.java     |  36 +-
 .../ofbiz/order/shoppingcart/ShoppingCartItem.java |  82 ++--
 .../order/shoppingcart/ShoppingCartServices.java   |  78 ++--
 .../shoppingcart/product/ProductDisplayWorker.java |   6 +-
 .../shoppingcart/product/ProductPromoWorker.java   |  86 ++--
 .../product/ProductStoreCartAwareEvents.java       |   4 +-
 .../shipping/ShippingEstimateWrapper.java          |   6 +-
 .../shoppingcart/shipping/ShippingEvents.java      |  20 +-
 .../order/shoppinglist/ShoppingListEvents.java     |  44 +-
 .../order/shoppinglist/ShoppingListServices.java   |  66 +--
 .../org/apache/ofbiz/order/task/TaskEvents.java    |  12 +-
 .../org/apache/ofbiz/order/task/TaskWorker.java    |   4 +-
 .../apache/ofbiz/order/test/FinAccountTest.java    |   4 +-
 .../org/apache/ofbiz/order/test/OrderTest.java     |   8 +-
 .../apache/ofbiz/order/test/OrderTestServices.java |  20 +-
 .../apache/ofbiz/order/test/PurchaseOrderTest.java |   4 +-
 .../apache/ofbiz/order/test/SalesOrderTest.java    |   4 +-
 .../thirdparty/paypal/ExpressCheckoutEvents.java   |  20 +-
 .../order/thirdparty/taxware/TaxwareServices.java  |   4 +-
 .../ofbiz/order/thirdparty/taxware/TaxwareUTL.java |  30 +-
 .../thirdparty/zipsales/ZipSalesServices.java      |  34 +-
 .../communication/CommunicationEventServices.java  | 130 +++---
 .../apache/ofbiz/party/contact/ContactHelper.java  |   4 +-
 .../ofbiz/party/contact/ContactMechServices.java   |  48 +--
 .../ofbiz/party/contact/ContactMechWorker.java     |  76 ++--
 .../ofbiz/party/content/PartyContentWrapper.java   |  14 +-
 .../org/apache/ofbiz/party/party/PartyHelper.java  |   8 +-
 .../ofbiz/party/party/PartyRelationshipHelper.java |   4 +-
 .../party/party/PartyRelationshipServices.java     |  10 +-
 .../apache/ofbiz/party/party/PartyServices.java    | 140 +++----
 .../apache/ofbiz/party/party/PartyTypeHelper.java  |   4 +-
 .../org/apache/ofbiz/party/party/PartyWorker.java  |  38 +-
 .../apache/ofbiz/party/party/UpgradeServices.java  |   4 +-
 .../ofbiz/product/catalog/CatalogWorker.java       |  18 +-
 .../product/category/CatalogUrlDirective.java      |   2 +-
 .../ofbiz/product/category/CatalogUrlFilter.java   |  16 +-
 .../product/category/CatalogUrlSeoFilter.java      |   2 +-
 .../ofbiz/product/category/CatalogUrlServlet.java  |   4 +-
 .../product/category/CategoryContentWrapper.java   |   6 +-
 .../ofbiz/product/category/CategoryServices.java   |  22 +-
 .../ofbiz/product/category/CategoryWorker.java     |  24 +-
 .../ofbiz/product/category/ControlServlet.java     |   2 +-
 .../product/category/SeoCatalogUrlServlet.java     |   4 +-
 .../ofbiz/product/category/SeoConfigUtil.java      |  62 +--
 .../product/category/SeoContentUrlFilter.java      |   6 +-
 .../ofbiz/product/category/SeoControlServlet.java  |   2 +-
 .../category/ftl/CatalogAltUrlSeoTransform.java    |   4 +-
 .../category/ftl/CatalogUrlSeoTransform.java       |  18 +-
 .../category/ftl/OfbizCatalogAltUrlTransform.java  |   2 +-
 .../category/ftl/OfbizCatalogUrlTransform.java     |   2 +-
 .../ofbiz/product/category/ftl/SeoTransform.java   |   4 +-
 .../product/category/ftl/UrlRegexpTransform.java   |  10 +-
 .../config/ProductConfigItemContentWrapper.java    |   4 +-
 .../ofbiz/product/config/ProductConfigWorker.java  |  28 +-
 .../ofbiz/product/config/ProductConfigWrapper.java |   4 +-
 .../ofbiz/product/feature/ParametricSearch.java    |   8 +-
 .../product/feature/ProductFeatureServices.java    |  16 +-
 .../org/apache/ofbiz/product/image/ScaleImage.java |  32 +-
 .../ofbiz/product/imagemanagement/CropImage.java   |  14 +-
 .../ofbiz/product/imagemanagement/FrameImage.java  |  24 +-
 .../imagemanagement/ImageManagementHelper.java     |   4 +-
 .../imagemanagement/ImageManagementServices.java   |  92 ++---
 .../product/imagemanagement/ImageUrlServlet.java   |   6 +-
 .../product/imagemanagement/ReplaceImage.java      |  10 +-
 .../ofbiz/product/imagemanagement/RotateImage.java |  14 +-
 .../ofbiz/product/inventory/InventoryServices.java |  66 +--
 .../ofbiz/product/inventory/InventoryWorker.java   |   6 +-
 .../ofbiz/product/migrate/MigrationServices.java   |   6 +-
 .../apache/ofbiz/product/price/PriceServices.java  |  80 ++--
 .../apache/ofbiz/product/product/KeywordIndex.java |  14 +-
 .../product/product/ProductContentWrapper.java     |   8 +-
 .../ofbiz/product/product/ProductEvents.java       |  60 +--
 .../product/ProductPromoContentWrapper.java        |   6 +-
 .../ofbiz/product/product/ProductSearch.java       |  38 +-
 .../ofbiz/product/product/ProductSearchEvents.java |  30 +-
 .../product/product/ProductSearchSession.java      |  32 +-
 .../ofbiz/product/product/ProductServices.java     | 128 +++---
 .../ofbiz/product/product/ProductUtilServices.java |  84 ++--
 .../ofbiz/product/product/ProductWorker.java       |  72 ++--
 .../ofbiz/product/product/VariantEvents.java       |   6 +-
 .../apache/ofbiz/product/promo/PromoServices.java  |  18 +-
 .../spreadsheetimport/ImportProductHelper.java     |   4 +-
 .../spreadsheetimport/ImportProductServices.java   |  10 +-
 .../ofbiz/product/store/ProductStoreEvents.java    |   4 +-
 .../product/store/ProductStoreSurveyWrapper.java   |   2 +-
 .../ofbiz/product/store/ProductStoreWorker.java    |  58 +--
 .../product/subscription/SubscriptionServices.java |  26 +-
 .../product/supplier/SupplierProductServices.java  |   6 +-
 .../ofbiz/shipment/packing/PackingServices.java    |  14 +-
 .../ofbiz/shipment/packing/PackingSession.java     |  36 +-
 .../ofbiz/shipment/packing/PackingSessionLine.java |  10 +-
 .../ofbiz/shipment/picklist/PickListServices.java  |  10 +-
 .../ofbiz/shipment/shipment/ShipmentEvents.java    |   8 +-
 .../ofbiz/shipment/shipment/ShipmentServices.java  |  68 +--
 .../ofbiz/shipment/shipment/ShipmentWorker.java    |  16 +-
 .../ofbiz/shipment/thirdparty/dhl/DhlServices.java |  84 ++--
 .../shipment/thirdparty/fedex/FedexServices.java   |  66 +--
 .../ofbiz/shipment/thirdparty/ups/UpsServices.java | 216 +++++-----
 .../thirdparty/usps/UspsMockApiServlet.java        |  10 +-
 .../shipment/thirdparty/usps/UspsServices.java     |  72 ++--
 .../thirdparty/usps/UspsServicesTests.java         |  46 +--
 .../ofbiz/shipment/verify/VerifyPickSession.java   |   6 +-
 .../weightPackage/WeightPackageSession.java        |   8 +-
 .../securityext/cert/CertificateServices.java      |   2 +-
 .../ofbiz/securityext/login/LoginEvents.java       |  14 +-
 .../content/WorkEffortContentWrapper.java          |  18 +-
 .../ofbiz/workeffort/workeffort/ICalConverter.java |  38 +-
 .../workeffort/workeffort/ICalHandlerFactory.java  |  18 +-
 .../ofbiz/workeffort/workeffort/ICalWorker.java    |  26 +-
 .../workeffort/WorkEffortKeywordIndex.java         |  12 +-
 .../WorkEffortPartyAssignmentServices.java         |  20 +-
 .../workeffort/workeffort/WorkEffortSearch.java    |  28 +-
 .../workeffort/WorkEffortSearchEvents.java         |   2 +-
 .../workeffort/WorkEffortSearchSession.java        |   8 +-
 .../workeffort/workeffort/WorkEffortServices.java  |  54 +--
 .../workeffort/workeffort/WorkEffortWorker.java    |   4 +-
 .../ofbiz/base/component/ComponentConfig.java      |   8 +-
 .../base/component/ComponentLoaderConfig.java      |   4 +-
 .../base/component/ComponentResourceHandler.java   |   4 +-
 .../ofbiz/base/concurrent/ExecutionPool.java       |   6 +-
 .../apache/ofbiz/base/config/JNDIConfigUtil.java   |   4 +-
 .../ofbiz/base/config/MainResourceHandler.java     |   4 +-
 .../apache/ofbiz/base/config/ResourceLoader.java   |   4 +-
 .../ofbiz/base/container/ComponentContainer.java   |  16 +-
 .../ofbiz/base/container/ContainerLoader.java      |  22 +-
 .../base/container/NamingServiceContainer.java     |   2 +-
 .../apache/ofbiz/base/conversion/Converters.java   |  12 +-
 .../ofbiz/base/conversion/NetConverters.java       |   2 +-
 .../apache/ofbiz/base/crypto/BlowFishCrypt.java    |  10 +-
 .../org/apache/ofbiz/base/crypto/DesCrypt.java     |   2 +-
 .../org/apache/ofbiz/base/crypto/HashCrypt.java    |   6 +-
 .../java/org/apache/ofbiz/base/crypto/Main.java    |  10 +-
 .../base/location/ComponentLocationResolver.java   |   4 +-
 .../ofbiz/base/location/FlexibleLocation.java      |   4 +-
 .../apache/ofbiz/base/util/AliasKeyManager.java    |   8 +-
 .../java/org/apache/ofbiz/base/util/Debug.java     | 182 ++++----
 .../java/org/apache/ofbiz/base/util/FileUtil.java  |  16 +-
 .../org/apache/ofbiz/base/util/GroovyUtil.java     |  14 +-
 .../org/apache/ofbiz/base/util/HttpClient.java     |  34 +-
 .../ofbiz/base/util/HttpRequestFileUpload.java     |  18 +-
 .../apache/ofbiz/base/util/JNDIContextFactory.java |   4 +-
 .../org/apache/ofbiz/base/util/KeyStoreUtil.java   |   6 +-
 .../org/apache/ofbiz/base/util/MessageString.java  |   2 +-
 .../apache/ofbiz/base/util/MultiTrustManager.java  |  12 +-
 .../org/apache/ofbiz/base/util/ObjectType.java     |  28 +-
 .../org/apache/ofbiz/base/util/PatternFactory.java |   4 +-
 .../apache/ofbiz/base/util/ReferenceCleaner.java   |   2 +-
 .../java/org/apache/ofbiz/base/util/SSLUtil.java   |  24 +-
 .../org/apache/ofbiz/base/util/ScriptUtil.java     |  44 +-
 .../org/apache/ofbiz/base/util/StringUtil.java     |   6 +-
 .../org/apache/ofbiz/base/util/TimeDuration.java   |   4 +-
 .../org/apache/ofbiz/base/util/URLConnector.java   |   6 +-
 .../java/org/apache/ofbiz/base/util/UtilCodec.java |  18 +-
 .../org/apache/ofbiz/base/util/UtilDateTime.java   |   4 +-
 .../org/apache/ofbiz/base/util/UtilFormatOut.java  |   8 +-
 .../org/apache/ofbiz/base/util/UtilGenerics.java   |   2 +-
 .../java/org/apache/ofbiz/base/util/UtilHttp.java  |  46 +--
 .../java/org/apache/ofbiz/base/util/UtilIO.java    |   4 +-
 .../org/apache/ofbiz/base/util/UtilJavaParse.java  |   6 +-
 .../java/org/apache/ofbiz/base/util/UtilMisc.java  |  22 +-
 .../org/apache/ofbiz/base/util/UtilNumber.java     |  12 +-
 .../org/apache/ofbiz/base/util/UtilObject.java     |   6 +-
 .../java/org/apache/ofbiz/base/util/UtilPlist.java |   2 +-
 .../org/apache/ofbiz/base/util/UtilProperties.java |  38 +-
 .../java/org/apache/ofbiz/base/util/UtilTimer.java |  22 +-
 .../java/org/apache/ofbiz/base/util/UtilURL.java   |   8 +-
 .../org/apache/ofbiz/base/util/UtilValidate.java   |   4 +-
 .../java/org/apache/ofbiz/base/util/UtilXml.java   |  48 +--
 .../ofbiz/base/util/cache/CacheSoftReference.java  |   4 +-
 .../apache/ofbiz/base/util/cache/UtilCache.java    |  14 +-
 .../base/util/collections/FlexibleMapAccessor.java |  12 +-
 .../ofbiz/base/util/collections/MapComparator.java |   4 +-
 .../ofbiz/base/util/collections/MapContext.java    |   2 +-
 .../ofbiz/base/util/collections/MapStack.java      |   4 +-
 .../util/collections/MultivaluedMapContext.java    |   2 +-
 .../util/collections/ResourceBundleMapWrapper.java |   6 +-
 .../base/util/string/FlexibleStringExpander.java   |  22 +-
 .../ofbiz/base/util/string/JuelConnector.java      |  10 +-
 .../ofbiz/base/util/string/NodeELResolver.java     |   6 +-
 .../ofbiz/base/util/string/UelFunctions.java       |  24 +-
 .../org/apache/ofbiz/base/util/string/UelUtil.java |  18 +-
 .../ofbiz/base/util/template/XslTransform.java     |   6 +-
 .../catalina/container/CatalinaContainer.java      |  26 +-
 .../container/CrossSubdomainSessionValve.java      |   8 +-
 .../ofbiz/catalina/container/OFBizRealm.java       |   4 +-
 .../org/apache/ofbiz/common/CdyneServices.java     |   6 +-
 .../java/org/apache/ofbiz/common/CommonEvents.java |  22 +-
 .../org/apache/ofbiz/common/CommonServices.java    |  52 +--
 .../org/apache/ofbiz/common/CommonWorkers.java     |  10 +-
 .../java/org/apache/ofbiz/common/FindServices.java |   8 +-
 .../java/org/apache/ofbiz/common/FtpServices.java  |  42 +-
 .../ofbiz/common/JsLanguageFileMappingCreator.java |   4 +-
 .../org/apache/ofbiz/common/KeywordSearchUtil.java |   6 +-
 .../org/apache/ofbiz/common/UrlServletHelper.java  |  10 +-
 .../ofbiz/common/authentication/AuthHelper.java    |   6 +-
 .../example/TestFailAuthenticator.java             |  16 +-
 .../example/TestPassAuthenticator.java             |   4 +-
 .../apache/ofbiz/common/email/EmailServices.java   |  50 +--
 .../ofbiz/common/email/NotificationServices.java   |  16 +-
 .../org/apache/ofbiz/common/geo/GeoWorker.java     |  14 +-
 .../apache/ofbiz/common/image/ImageTransform.java  |  26 +-
 .../common/login/LdapAuthenticationServices.java   |  30 +-
 .../apache/ofbiz/common/login/LoginServices.java   |  70 ++--
 .../apache/ofbiz/common/period/PeriodWorker.java   |   2 +-
 .../common/preferences/PreferenceServices.java     |  14 +-
 .../ofbiz/common/preferences/PreferenceWorker.java |   2 +-
 .../apache/ofbiz/common/qrcode/QRCodeEvents.java   |  14 +-
 .../apache/ofbiz/common/qrcode/QRCodeServices.java |   8 +-
 .../ofbiz/common/scripting/ContextHelper.java      |   2 +-
 .../ofbiz/common/scripting/ScriptHelperImpl.java   |  22 +-
 .../apache/ofbiz/common/status/StatusServices.java |   6 +-
 .../apache/ofbiz/common/status/StatusWorker.java   |  10 +-
 .../ofbiz/common/telecom/TelecomServices.java      |  10 +-
 .../apache/ofbiz/common/test/PerformFindTests.java |   4 +-
 .../org/apache/ofbiz/common/uom/UomWorker.java     |   6 +-
 .../java/org/apache/ofbiz/datafile/DataFile.java   |   4 +-
 .../apache/ofbiz/datafile/DataFile2EntityXml.java  |   6 +-
 .../apache/ofbiz/datafile/ModelDataFileReader.java |  18 +-
 .../org/apache/ofbiz/datafile/RecordIterator.java  |   2 +-
 .../org/apache/ofbiz/entity/DelegatorFactory.java  |   6 +-
 .../apache/ofbiz/entity/DelegatorFactoryImpl.java  |   6 +-
 .../org/apache/ofbiz/entity/GenericDelegator.java  | 106 ++---
 .../org/apache/ofbiz/entity/GenericEntity.java     |  28 +-
 .../entity/cache/AbstractEntityConditionCache.java |   6 +-
 .../java/org/apache/ofbiz/entity/cache/Cache.java  |   6 +-
 .../org/apache/ofbiz/entity/cache/EntityCache.java |   8 +-
 .../apache/ofbiz/entity/cache/EntityListCache.java |   4 +-
 .../ofbiz/entity/cache/EntityObjectCache.java      |   2 +-
 .../entity/condition/EntityComparisonOperator.java |   6 +-
 .../entity/condition/EntityConditionBuilder.java   |   2 +-
 .../entity/condition/EntityConditionListBase.java  |   2 +-
 .../entity/condition/EntityConditionSubSelect.java |   4 +-
 .../apache/ofbiz/entity/condition/EntityExpr.java  |  18 +-
 .../ofbiz/entity/condition/EntityFieldValue.java   |   2 +-
 .../apache/ofbiz/entity/condition/OrderByItem.java |   2 +-
 .../ofbiz/entity/config/model/EntityConfig.java    |   4 +-
 .../entity/connection/DBCPConnectionFactory.java   |   4 +-
 .../entity/connection/DebugManagedDataSource.java  |   6 +-
 .../apache/ofbiz/entity/datasource/GenericDAO.java |  42 +-
 .../ofbiz/entity/datasource/GenericHelperDAO.java  |   6 +-
 .../entity/datasource/GenericHelperFactory.java    |  10 +-
 .../ofbiz/entity/datasource/ReadOnlyHelperDAO.java |   2 +-
 .../apache/ofbiz/entity/finder/ByAndFinder.java    |   2 +-
 .../ofbiz/entity/finder/ByConditionFinder.java     |   2 +-
 .../ofbiz/entity/finder/EntityFinderUtil.java      |  18 +-
 .../org/apache/ofbiz/entity/finder/ListFinder.java |  12 +-
 .../ofbiz/entity/finder/PrimaryKeyFinder.java      |   6 +-
 .../ofbiz/entity/jdbc/ConnectionFactoryLoader.java |   8 +-
 .../apache/ofbiz/entity/jdbc/CursorConnection.java |   6 +-
 .../apache/ofbiz/entity/jdbc/CursorResultSet.java  |   6 +-
 .../apache/ofbiz/entity/jdbc/CursorStatement.java  |   6 +-
 .../org/apache/ofbiz/entity/jdbc/DatabaseUtil.java | 430 +++++++++----------
 .../apache/ofbiz/entity/jdbc/JdbcValueHandler.java |   8 +-
 .../org/apache/ofbiz/entity/jdbc/SQLProcessor.java |  86 ++--
 .../org/apache/ofbiz/entity/jdbc/SqlJdbcUtil.java  |  22 +-
 .../ofbiz/entity/model/DynamicViewEntity.java      |   2 +-
 .../org/apache/ofbiz/entity/model/ModelEntity.java |  20 +-
 .../ofbiz/entity/model/ModelEntityChecker.java     |   6 +-
 .../org/apache/ofbiz/entity/model/ModelField.java  |   2 +-
 .../apache/ofbiz/entity/model/ModelFieldType.java  |   2 +-
 .../ofbiz/entity/model/ModelFieldTypeReader.java   |   8 +-
 .../ofbiz/entity/model/ModelGroupReader.java       |  14 +-
 .../org/apache/ofbiz/entity/model/ModelReader.java |  30 +-
 .../org/apache/ofbiz/entity/model/ModelUtil.java   |   6 +-
 .../apache/ofbiz/entity/model/ModelViewEntity.java |  44 +-
 .../ofbiz/entity/serialize/XmlSerializer.java      |   6 +-
 .../apache/ofbiz/entity/test/EntityTestSuite.java  |  58 +--
 .../ofbiz/entity/test/EntityUtilTestSuite.java     |   2 +-
 .../ofbiz/entity/transaction/DebugXaResource.java  |  10 +-
 .../entity/transaction/DumbTransactionFactory.java |   4 +-
 .../entity/transaction/GenericXaResource.java      |  10 +-
 .../transaction/GeronimoTransactionFactory.java    |   6 +-
 .../entity/transaction/JNDITransactionFactory.java |  30 +-
 .../transaction/TransactionFactoryLoader.java      |   8 +-
 .../ofbiz/entity/transaction/TransactionUtil.java  |  88 ++--
 .../org/apache/ofbiz/entity/util/EntityCrypto.java |   8 +-
 .../apache/ofbiz/entity/util/EntityDataAssert.java |  10 +-
 .../apache/ofbiz/entity/util/EntityDataLoader.java |  24 +-
 .../ofbiz/entity/util/EntityListIterator.java      |  12 +-
 .../org/apache/ofbiz/entity/util/EntityQuery.java  |   4 +-
 .../apache/ofbiz/entity/util/EntitySaxReader.java  |  42 +-
 .../apache/ofbiz/entity/util/EntityTypeUtil.java   |   8 +-
 .../org/apache/ofbiz/entity/util/EntityUtil.java   |   4 +-
 .../ofbiz/entity/util/EntityUtilProperties.java    |  20 +-
 .../org/apache/ofbiz/entity/util/SequenceUtil.java |  26 +-
 .../apache/ofbiz/entityext/EntityGroupUtil.java    |   4 +-
 .../ofbiz/entityext/EntityServiceFactory.java      |   2 +-
 .../ofbiz/entityext/EntityWatchServices.java       |  12 +-
 .../ofbiz/entityext/cache/EntityCacheServices.java |  58 +--
 .../entityext/data/EntityDataLoadContainer.java    |  46 +--
 .../ofbiz/entityext/data/EntityDataServices.java   |  76 ++--
 .../ofbiz/entityext/data/UpgradeServices.java      |   8 +-
 .../ofbiz/entityext/eca/DelegatorEcaHandler.java   |   8 +-
 .../ofbiz/entityext/eca/EntityEcaAction.java       |  10 +-
 .../ofbiz/entityext/eca/EntityEcaCondition.java    |  10 +-
 .../apache/ofbiz/entityext/eca/EntityEcaRule.java  |  14 +-
 .../ofbiz/entityext/eca/EntityEcaSetField.java     |   4 +-
 .../apache/ofbiz/entityext/eca/EntityEcaUtil.java  |  18 +-
 .../permission/EntityPermissionChecker.java        |  38 +-
 .../synchronization/EntitySyncContext.java         |  56 +--
 .../synchronization/EntitySyncServices.java        |  54 +--
 .../org/apache/ofbiz/minilang/MiniLangElement.java |   4 +-
 .../org/apache/ofbiz/minilang/MiniLangUtil.java    |   8 +-
 .../apache/ofbiz/minilang/MiniLangValidate.java    |   4 +-
 .../org/apache/ofbiz/minilang/SimpleMethod.java    |  10 +-
 .../minilang/method/callops/CallClassMethod.java   |   2 +-
 .../minilang/method/callops/CallObjectMethod.java  |   2 +-
 .../ofbiz/minilang/method/callops/CallScript.java  |   2 +-
 .../minilang/method/callops/CallServiceAsynch.java |   4 +-
 .../minilang/method/callops/CallSimpleMethod.java  |  10 +-
 .../minilang/method/callops/SetServiceFields.java  |   4 +-
 .../method/conditional/ConditionalFactory.java     |   4 +-
 .../method/conditional/EmptyCondition.java         |   2 +-
 .../method/conditional/RegexpCondition.java        |   8 +-
 .../conditional/ValidateMethodCondition.java       |   2 +-
 .../minilang/method/entityops/CreateValue.java     |   6 +-
 .../ofbiz/minilang/method/entityops/EntityAnd.java |   4 +-
 .../minilang/method/entityops/EntityCondition.java |   4 +-
 .../minilang/method/entityops/EntityData.java      |   6 +-
 .../ofbiz/minilang/method/entityops/EntityOne.java |   4 +-
 .../ofbiz/minilang/method/entityops/FindByAnd.java |   4 +-
 .../method/entityops/FindByPrimaryKey.java         |   4 +-
 .../minilang/method/entityops/GetRelated.java      |   4 +-
 .../minilang/method/entityops/GetRelatedOne.java   |   4 +-
 .../minilang/method/entityops/MakeNextSeqId.java   |   2 +-
 .../minilang/method/entityops/RefreshValue.java    |   4 +-
 .../minilang/method/entityops/RemoveByAnd.java     |   4 +-
 .../minilang/method/entityops/RemoveList.java      |   4 +-
 .../minilang/method/entityops/RemoveRelated.java   |   4 +-
 .../minilang/method/entityops/RemoveValue.java     |   4 +-
 .../ofbiz/minilang/method/entityops/StoreList.java |   4 +-
 .../minilang/method/entityops/StoreValue.java      |   4 +-
 .../method/entityops/TransactionBegin.java         |   4 +-
 .../method/entityops/TransactionCommit.java        |   4 +-
 .../method/entityops/TransactionRollback.java      |   4 +-
 .../ofbiz/minilang/method/envops/Assert.java       |   2 +-
 .../ofbiz/minilang/method/envops/CheckId.java      |   2 +-
 .../ofbiz/minilang/method/envops/CreateObject.java |   4 +-
 .../ofbiz/minilang/method/envops/Iterate.java      |  10 +-
 .../ofbiz/minilang/method/envops/IterateMap.java   |  10 +-
 .../apache/ofbiz/minilang/method/envops/Loop.java  |   2 +-
 .../ofbiz/minilang/method/envops/SetCalendar.java  |   4 +-
 .../ofbiz/minilang/method/envops/SetOperation.java |  14 +-
 .../ofbiz/minilang/method/otherops/Calculate.java  |   2 +-
 .../ofbiz/minilang/method/otherops/Trace.java      |   2 +-
 .../minilang/method/serviceops/FieldToResult.java  |   2 +-
 .../apache/ofbiz/minilang/operation/Convert.java   |   8 +-
 .../org/apache/ofbiz/minilang/operation/Copy.java  |   4 +-
 .../ofbiz/minilang/operation/InFieldOper.java      |   6 +-
 .../ofbiz/minilang/operation/MakeInString.java     |   4 +-
 .../ofbiz/minilang/operation/PropertyOper.java     |   4 +-
 .../apache/ofbiz/minilang/operation/Regexp.java    |   4 +-
 .../minilang/operation/SimpleMapOperation.java     |   6 +-
 .../ofbiz/minilang/operation/SimpleMapProcess.java |   4 +-
 .../ofbiz/minilang/operation/ValidateMethod.java   |   8 +-
 .../apache/ofbiz/minilang/test/MiniLangTests.java  |   4 +-
 .../java/org/apache/ofbiz/security/CsrfUtil.java   |   8 +-
 .../org/apache/ofbiz/security/SecurityFactory.java |  10 +-
 .../org/apache/ofbiz/security/SecurityUtil.java    |   8 +-
 .../org/apache/ofbiz/service/DispatchContext.java  |   6 +-
 .../ofbiz/service/GeneralServiceException.java     |   4 +-
 .../ofbiz/service/GenericAbstractDispatcher.java   |  26 +-
 .../ofbiz/service/GenericDispatcherFactory.java    |   2 +-
 .../apache/ofbiz/service/GenericResultWaiter.java  |  10 +-
 .../apache/ofbiz/service/ModelNotification.java    |  12 +-
 .../java/org/apache/ofbiz/service/ModelParam.java  |   6 +-
 .../org/apache/ofbiz/service/ModelPermGroup.java   |   2 +-
 .../org/apache/ofbiz/service/ModelPermission.java  |  22 +-
 .../org/apache/ofbiz/service/ModelService.java     |  36 +-
 .../apache/ofbiz/service/ModelServiceReader.java   |  42 +-
 .../org/apache/ofbiz/service/ServiceContainer.java |   8 +-
 .../apache/ofbiz/service/ServiceDispatcher.java    |  94 ++---
 .../java/org/apache/ofbiz/service/ServiceUtil.java |  10 +-
 .../org/apache/ofbiz/service/ServiceXaWrapper.java |  42 +-
 .../ofbiz/service/calendar/RecurrenceInfo.java     |   8 +-
 .../ofbiz/service/calendar/RecurrenceRule.java     |  22 +-
 .../service/calendar/TemporalExpressionWorker.java |   4 +-
 .../service/calendar/TemporalExpressions.java      |  72 ++--
 .../ofbiz/service/config/ServiceConfigUtil.java    |   4 +-
 .../ofbiz/service/config/model/ThreadPool.java     |  14 +-
 .../apache/ofbiz/service/eca/ServiceEcaAction.java |   4 +-
 .../ofbiz/service/eca/ServiceEcaCondition.java     |  20 +-
 .../apache/ofbiz/service/eca/ServiceEcaRule.java   |  14 +-
 .../ofbiz/service/eca/ServiceEcaSetField.java      |   6 +-
 .../apache/ofbiz/service/eca/ServiceEcaUtil.java   |  14 +-
 .../ofbiz/service/engine/AbstractEngine.java       |   6 +-
 .../ofbiz/service/engine/EntityAutoEngine.java     |  10 +-
 .../ofbiz/service/engine/GenericAsyncEngine.java   |   4 +-
 .../apache/ofbiz/service/engine/GroovyEngine.java  |   2 +-
 .../apache/ofbiz/service/engine/HttpEngine.java    |  16 +-
 .../ofbiz/service/engine/SOAPClientEngine.java     |  10 +-
 .../apache/ofbiz/service/engine/ScriptEngine.java  |   4 +-
 .../ofbiz/service/engine/SoapSerializer.java       |   4 +-
 .../ofbiz/service/engine/StandardJavaEngine.java   |   8 +-
 .../ofbiz/service/engine/XMLRPCClientEngine.java   |   6 +-
 .../org/apache/ofbiz/service/group/GroupModel.java |  16 +-
 .../ofbiz/service/group/GroupServiceModel.java     |   6 +-
 .../ofbiz/service/group/ServiceGroupReader.java    |  12 +-
 .../ofbiz/service/jms/AbstractJmsListener.java     |  26 +-
 .../ofbiz/service/jms/JmsListenerFactory.java      |  18 +-
 .../apache/ofbiz/service/jms/JmsQueueListener.java |   4 +-
 .../apache/ofbiz/service/jms/JmsSerializer.java    |   4 +-
 .../apache/ofbiz/service/jms/JmsServiceEngine.java |  10 +-
 .../apache/ofbiz/service/jms/JmsTopicListener.java |   4 +-
 .../org/apache/ofbiz/service/job/AbstractJob.java  |  10 +-
 .../ofbiz/service/job/GenericServiceJob.java       |  10 +-
 .../org/apache/ofbiz/service/job/JobManager.java   |  34 +-
 .../org/apache/ofbiz/service/job/JobPoller.java    |  26 +-
 .../org/apache/ofbiz/service/job/JobServices.java  |  14 +-
 .../java/org/apache/ofbiz/service/job/JobUtil.java |  10 +-
 .../ofbiz/service/job/PersistedServiceJob.java     |  46 +--
 .../org/apache/ofbiz/service/job/PurgeJob.java     |   2 +-
 .../ofbiz/service/mail/JavaMailContainer.java      |  36 +-
 .../ofbiz/service/mail/MimeMessageWrapper.java     |  62 +--
 .../ofbiz/service/mail/ServiceMcaAction.java       |   6 +-
 .../ofbiz/service/mail/ServiceMcaCondition.java    |  14 +-
 .../apache/ofbiz/service/mail/ServiceMcaRule.java  |   4 +-
 .../apache/ofbiz/service/mail/ServiceMcaUtil.java  |   8 +-
 .../ofbiz/service/rmi/ExampleRemoteClient.java     |   4 +-
 .../ofbiz/service/rmi/RemoteDispatcherImpl.java    |   4 +-
 .../ofbiz/service/rmi/RmiServiceContainer.java     |   2 +-
 .../rmi/socket/ssl/SSLClientSocketFactory.java     |   4 +-
 .../rmi/socket/ssl/SSLServerSocketFactory.java     |   6 +-
 .../ofbiz/service/test/AbstractXmlRpcTestCase.java |   2 +-
 .../test/ServiceEngineTestPermissionServices.java  |   2 +-
 .../service/test/ServiceEngineTestServices.java    |  64 +--
 .../ofbiz/service/test/ServiceSOAPTests.java       |   2 +-
 .../org/apache/ofbiz/service/test/XmlRpcTests.java |   2 +-
 .../apache/ofbiz/service/xmlrpc/XmlRpcClient.java  |   4 +-
 .../ofbiz/base/start/StartupControlPanel.java      |   2 +-
 .../ofbiz/testtools/EntityXmlAssertTest.java       |   4 +-
 .../apache/ofbiz/testtools/JunitSuiteWrapper.java  |   4 +-
 .../org/apache/ofbiz/testtools/ModelTestSuite.java |  10 +-
 .../org/apache/ofbiz/testtools/ServiceTest.java    |   2 +-
 .../apache/ofbiz/testtools/SimpleMethodTest.java   |   2 +-
 .../apache/ofbiz/testtools/TestRunContainer.java   |  28 +-
 .../org/apache/ofbiz/webapp/OfbizUrlBuilder.java   |   2 +-
 .../java/org/apache/ofbiz/webapp/WebAppUtil.java   |  18 +-
 .../ofbiz/webapp/control/ConfigXMLReader.java      |  18 +-
 .../apache/ofbiz/webapp/control/ContextFilter.java |   6 +-
 .../control/ControlActivationEventListener.java    |   8 +-
 .../ofbiz/webapp/control/ControlEventListener.java |  76 ++--
 .../apache/ofbiz/webapp/control/ControlFilter.java |  10 +-
 .../webapp/control/ExternalLoginKeysManager.java   |   4 +-
 .../apache/ofbiz/webapp/control/JWTManager.java    |  26 +-
 .../ofbiz/webapp/control/LoginEventListener.java   |   4 +-
 .../apache/ofbiz/webapp/control/LoginWorker.java   |  92 ++---
 .../ofbiz/webapp/control/ProtectViewWorker.java    |   6 +-
 .../ofbiz/webapp/control/RequestHandler.java       | 118 +++---
 .../apache/ofbiz/webapp/control/TokenFilter.java   |   4 +-
 .../org/apache/ofbiz/webapp/event/CoreEvents.java  |  12 +-
 .../apache/ofbiz/webapp/event/EventFactory.java    |   4 +-
 .../webapp/event/FileUploadProgressListener.java   |   2 +-
 .../ofbiz/webapp/event/GroovyEventHandler.java     |   6 +-
 .../ofbiz/webapp/event/JavaEventHandler.java       |  18 +-
 .../ofbiz/webapp/event/RomeEventHandler.java       |   2 +-
 .../ofbiz/webapp/event/SOAPEventHandler.java       |  26 +-
 .../ofbiz/webapp/event/ScriptEventHandler.java     |   4 +-
 .../ofbiz/webapp/event/ServiceEventHandler.java    |  14 +-
 .../webapp/event/ServiceMultiEventHandler.java     |  20 +-
 .../ofbiz/webapp/event/SimpleEventHandler.java     |  14 +-
 .../org/apache/ofbiz/webapp/event/TestEvent.java   |   8 +-
 .../ofbiz/webapp/ftl/CsrfTokenAjaxTransform.java   |   2 +-
 .../webapp/ftl/CsrfTokenPairNonAjaxTransform.java  |   2 +-
 .../ofbiz/webapp/ftl/FreeMarkerViewHandler.java    |   2 +-
 .../ofbiz/webapp/ftl/OfbizAmountTransform.java     |   2 +-
 .../ofbiz/webapp/ftl/OfbizContentTransform.java    |   6 +-
 .../ofbiz/webapp/ftl/OfbizCurrencyTransform.java   |  14 +-
 .../ofbiz/webapp/ftl/OfbizNumberTransform.java     |  10 +-
 .../apache/ofbiz/webapp/ftl/OfbizUrlTransform.java |   8 +-
 .../webapp/ftl/RenderWrappedTextTransform.java     |   4 +-
 .../ofbiz/webapp/ftl/SetContextFieldTransform.java |   2 +-
 .../webapp/ftl/SetRequestAttributeMethod.java      |   2 +-
 .../apache/ofbiz/webapp/stats/ServerHitBin.java    |  16 +-
 .../apache/ofbiz/webapp/stats/VisitHandler.java    |  34 +-
 .../apache/ofbiz/webapp/taglib/ContentUrlTag.java  |   4 +-
 .../apache/ofbiz/webapp/view/ApacheFopWorker.java  |  10 +-
 .../apache/ofbiz/webapp/view/HttpViewHandler.java  |   4 +-
 .../apache/ofbiz/webapp/view/JspViewHandler.java   |  10 +-
 .../org/apache/ofbiz/webapp/view/ViewFactory.java  |   4 +-
 .../apache/ofbiz/webapp/webdav/ResponseHelper.java |   4 +-
 .../apache/ofbiz/webapp/webdav/WebDavServlet.java  |   6 +-
 .../org/apache/ofbiz/webapp/webdav/WebDavUtil.java |   4 +-
 .../apache/ofbiz/webapp/website/WebSiteWorker.java |   4 +-
 .../org/apache/ofbiz/webtools/GenericWebEvent.java |  42 +-
 .../org/apache/ofbiz/webtools/UtilCacheEvents.java |   6 +-
 .../apache/ofbiz/webtools/WebToolsServices.java    |  28 +-
 .../webtools/artifactinfo/ArtifactInfoFactory.java |  36 +-
 .../ControllerRequestArtifactInfo.java             |   6 +-
 .../artifactinfo/ControllerViewArtifactInfo.java   |   2 +-
 .../artifactinfo/FormWidgetArtifactInfo.java       |   8 +-
 .../ofbiz/webtools/artifactinfo/RunTestEvents.java |   2 +-
 .../artifactinfo/ScreenWidgetArtifactInfo.java     |   8 +-
 .../webtools/artifactinfo/ServiceArtifactInfo.java |  24 +-
 .../ofbiz/webtools/labelmanager/LabelFile.java     |   2 +-
 .../ofbiz/webtools/labelmanager/LabelInfo.java     |   4 +-
 .../webtools/labelmanager/LabelManagerFactory.java |   6 +-
 .../webtools/labelmanager/LabelReferences.java     |   4 +-
 .../ofbiz/webtools/labelmanager/LabelValue.java    |   2 +-
 .../webtools/labelmanager/SaveLabelsToXmlFile.java |  10 +-
 .../ofbiz/webtools/print/FoPrintServerEvents.java  |   8 +-
 .../org/apache/ofbiz/widget/WidgetFactory.java     |  14 +-
 .../java/org/apache/ofbiz/widget/WidgetWorker.java |   2 +-
 .../ofbiz/widget/cache/GenericWidgetOutput.java    |   2 +-
 .../org/apache/ofbiz/widget/cache/ScreenCache.java |   6 +-
 .../ofbiz/widget/cache/WidgetContextCacheKey.java  |  10 +-
 .../ofbiz/widget/content/WidgetContentWorker.java  |   4 +-
 .../widget/content/WidgetDataResourceWorker.java   |   4 +-
 .../ofbiz/widget/model/AbstractModelAction.java    |  50 +--
 .../ofbiz/widget/model/AbstractModelCondition.java |  28 +-
 .../ofbiz/widget/model/CommonWidgetModels.java     |  12 +-
 .../org/apache/ofbiz/widget/model/FieldInfo.java   |   4 +-
 .../org/apache/ofbiz/widget/model/FormFactory.java |   2 +-
 .../org/apache/ofbiz/widget/model/GridFactory.java |   2 +-
 .../org/apache/ofbiz/widget/model/HtmlWidget.java  |   4 +-
 .../ofbiz/widget/model/IterateSectionWidget.java   |  10 +-
 .../org/apache/ofbiz/widget/model/MenuFactory.java |   2 +-
 .../org/apache/ofbiz/widget/model/ModelForm.java   |  22 +-
 .../apache/ofbiz/widget/model/ModelFormAction.java |   4 +-
 .../apache/ofbiz/widget/model/ModelFormField.java  |  54 +--
 .../ofbiz/widget/model/ModelFormFieldBuilder.java  |   6 +-
 .../org/apache/ofbiz/widget/model/ModelGrid.java   |   8 +-
 .../org/apache/ofbiz/widget/model/ModelMenu.java   |   6 +-
 .../apache/ofbiz/widget/model/ModelMenuAction.java |  16 +-
 .../ofbiz/widget/model/ModelMenuCondition.java     |   2 +-
 .../apache/ofbiz/widget/model/ModelMenuItem.java   |   4 +-
 .../org/apache/ofbiz/widget/model/ModelScreen.java |  12 +-
 .../ofbiz/widget/model/ModelScreenCondition.java   |   2 +-
 .../ofbiz/widget/model/ModelScreenWidget.java      |  60 +--
 .../apache/ofbiz/widget/model/ModelSingleForm.java |   8 +-
 .../org/apache/ofbiz/widget/model/ModelTheme.java  |  10 +-
 .../org/apache/ofbiz/widget/model/ModelTree.java   |  16 +-
 .../apache/ofbiz/widget/model/ModelTreeAction.java |  12 +-
 .../ofbiz/widget/model/ModelTreeCondition.java     |   2 +-
 .../org/apache/ofbiz/widget/model/ModelWidget.java |   4 +-
 .../ofbiz/widget/model/ModelWidgetCondition.java   |  26 +-
 .../apache/ofbiz/widget/model/ScreenFactory.java   |   6 +-
 .../apache/ofbiz/widget/model/ThemeFactory.java    |  10 +-
 .../org/apache/ofbiz/widget/model/TreeFactory.java |   2 +-
 .../ofbiz/widget/model/XmlWidgetActionVisitor.java |   2 +-
 .../ofbiz/widget/portal/PortalPageWorker.java      |   6 +-
 .../apache/ofbiz/widget/renderer/FormRenderer.java |  14 +-
 .../ofbiz/widget/renderer/MenuWrapTransform.java   |   6 +-
 .../apache/ofbiz/widget/renderer/Paginator.java    |  14 +-
 .../ofbiz/widget/renderer/ScreenRenderer.java      |   4 +-
 .../apache/ofbiz/widget/renderer/UtilHelpText.java |  14 +-
 .../apache/ofbiz/widget/renderer/VisualTheme.java  |   2 +-
 .../ofbiz/widget/renderer/fo/FoFormRenderer.java   |   2 +-
 .../widget/renderer/fo/ScreenFopViewHandler.java   |  10 +-
 .../widget/renderer/html/HtmlMenuRenderer.java     |   2 +-
 .../renderer/html/HtmlMenuRendererImage.java       |   2 +-
 .../widget/renderer/html/HtmlMenuWrapper.java      |   2 +-
 .../widget/renderer/html/HtmlMenuWrapperImage.java |   2 +-
 .../widget/renderer/html/HtmlTreeRenderer.java     |   4 +-
 .../widget/renderer/html/HtmlWidgetRenderer.java   |   2 +-
 .../widget/renderer/macro/MacroFormRenderer.java   |  24 +-
 .../widget/renderer/macro/MacroMenuRenderer.java   |   4 +-
 .../widget/renderer/macro/MacroScreenRenderer.java |  40 +-
 .../renderer/macro/MacroScreenViewHandler.java     |   4 +-
 .../widget/renderer/macro/MacroTreeRenderer.java   |   4 +-
 685 files changed, 7053 insertions(+), 7053 deletions(-)

diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
index 45ce3d3..c3ba688 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/GlEvents.java
@@ -38,7 +38,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class GlEvents {
 
-public static final String module = GlEvents.class.getName();
+public static final String MODULE = GlEvents.class.getName();
 public static String createReconcileAccount(HttpServletRequest request, HttpServletResponse response) {
     LocalDispatcher dispatcher = (LocalDispatcher) request.getAttribute("dispatcher");
     final Delegator delegator = (Delegator)request.getAttribute("delegator");
@@ -75,7 +75,7 @@ public static String createReconcileAccount(HttpServletRequest request, HttpServ
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return "error";
         }
 
@@ -88,7 +88,7 @@ public static String createReconcileAccount(HttpServletRequest request, HttpServ
             return "error";
          }
     } catch (GenericServiceException e) {
-        Debug.logError(e, module);
+        Debug.logError(e, MODULE);
         return "error";
     }
     String glReconciliationId = (String) glReconResult.get("glReconciliationId");
@@ -115,12 +115,12 @@ public static String createReconcileAccount(HttpServletRequest request, HttpServ
                         return "error";
                     }
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return "error";
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return "error";
         }
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
index 5c4a870..7fe5ed6 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/agreement/AgreementServices.java
@@ -44,7 +44,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class AgreementServices {
 
-    public static final String module = AgreementServices.class.getName();
+    public static final String MODULE = AgreementServices.class.getName();
     // set some BigDecimal properties
     public static final int decimals = UtilNumber.getBigDecimalScale("finaccount.decimals");
     public static final RoundingMode rounding = UtilNumber.getRoundingMode("finaccount.rounding");
@@ -171,7 +171,7 @@ public class AgreementServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, module);
+            Debug.logWarning(e, MODULE);
             Map<String, String> messageMap = UtilMisc.toMap("errMessage", e.getMessage());
             errMsg = UtilProperties.getMessage("CommonUiLabels", "CommonDatabaseProblem", messageMap, locale);
             return ServiceUtil.returnError(errMsg);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
index 7f3c4b1..3ecc32b 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountPaymentServices.java
@@ -52,7 +52,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class FinAccountPaymentServices {
 
-    public static final String module = FinAccountPaymentServices.class.getName();
+    public static final String MODULE = FinAccountPaymentServices.class.getName();
     public static final String resourceError = "AccountingErrorUiLabels";
 
     // base payment integration services
@@ -80,7 +80,7 @@ public class FinAccountPaymentServices {
                         return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result));
                     }
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
             }
@@ -110,7 +110,7 @@ public class FinAccountPaymentServices {
                 finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId)
                         .queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         } else {
@@ -118,7 +118,7 @@ public class FinAccountPaymentServices {
                 try {
                     finAccount = FinAccountHelper.getFinAccountFromCode(finAccountCode, delegator);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                             "AccountingFinAccountCannotLocateItFromAccountCode", locale));
                 }
@@ -146,10 +146,10 @@ public class FinAccountPaymentServices {
             if (finAccountSettings == null) {
                 Debug.logWarning(
                         "In finAccountPreAuth could not find ProductStoreFinActSetting record, values searched by: "
-                                + findProductStoreFinActSettingMap, module);
+                                + findProductStoreFinActSettingMap, MODULE);
             }
             if (Debug.verboseOn()) {
-                Debug.logVerbose("In finAccountPreAuth finAccountSettings=" + finAccountSettings, module);
+                Debug.logVerbose("In finAccountPreAuth finAccountSettings=" + finAccountSettings, MODULE);
             }
 
             BigDecimal minBalance = FinAccountHelper.ZERO;
@@ -173,7 +173,7 @@ public class FinAccountPaymentServices {
                         result.put("authFlag", "0");
                         result.put("authCode", "A");
                         result.put("authRefNum", "0");
-                        Debug.logWarning("Unable to auth FinAccount: " + result, module);
+                        Debug.logWarning("Unable to auth FinAccount: " + result, MODULE);
                         return result;
                     }
                 }
@@ -191,7 +191,7 @@ public class FinAccountPaymentServices {
                 result.put("authFlag", "0");
                 result.put("authCode", "A");
                 result.put("authRefNum", "0");
-                Debug.logWarning("Unable to auth FinAccount: " + result, module);
+                Debug.logWarning("Unable to auth FinAccount: " + result, MODULE);
                 return result;
             }
 
@@ -220,7 +220,7 @@ public class FinAccountPaymentServices {
                     result.put("authFlag", "0");
                     result.put("authCode", "A");
                     result.put("authRefNum", "0");
-                    Debug.logWarning("Unable to auth FinAccount: " + result, module);
+                    Debug.logWarning("Unable to auth FinAccount: " + result, MODULE);
                     return result;
                 }
             }
@@ -237,7 +237,7 @@ public class FinAccountPaymentServices {
                     Debug.logWarning("In finAccountPreAuth for finAccountId [" + finAccountId + "] availableBalance ["
                             + availableBalanceOriginal + "] was different after rounding [" + availableBalance
                             + "]; it should never have made it into the database this way, so check whatever put it there.",
-                            module);
+                            MODULE);
                 }
             }
 
@@ -249,7 +249,7 @@ public class FinAccountPaymentServices {
             // make sure to round and scale it to the same as availableBalance
             amount = amount.setScale(FinAccountHelper.decimals, FinAccountHelper.rounding);
 
-            Debug.logInfo("Allow auth to negative: " + allowAuthToNegative + " :: available: " + availableBalance + " comp: " + minBalance + " = " + availableBalance.compareTo(minBalance) + " :: req: " + amount, module);
+            Debug.logInfo("Allow auth to negative: " + allowAuthToNegative + " :: available: " + availableBalance + " comp: " + minBalance + " = " + availableBalance.compareTo(minBalance) + " :: req: " + amount, MODULE);
             // check the available balance to see if we can auth this tx
             if (("Y".equals(allowAuthToNegative) && availableBalance.compareTo(minBalance) > -1)
                     || (availableBalance.compareTo(amount) > -1)) {
@@ -274,7 +274,7 @@ public class FinAccountPaymentServices {
                 finAccount.refresh();
             } else {
                 Debug.logWarning("Attempted to authorize [" + amount + "] against a balance of only ["
-                        + availableBalance + "] for finAccountId [" + finAccountId + "]", module);
+                        + availableBalance + "] for finAccountId [" + finAccountId + "]", MODULE);
                 refNum = "0"; // a refNum is always required from authorization
                 authMessage = "Insufficient funds";
                 processResult = Boolean.FALSE;
@@ -287,11 +287,11 @@ public class FinAccountPaymentServices {
             result.put("authFlag", "1");
             result.put("authCode", "A");
             result.put("authRefNum", refNum);
-            Debug.logInfo("FinAccont Auth: " + result, module);
+            Debug.logInfo("FinAccont Auth: " + result, MODULE);
 
             return result;
         } catch (GenericEntityException | GenericServiceException ex) {
-            Debug.logError(ex, "Cannot authorize financial account", module);
+            Debug.logError(ex, "Cannot authorize financial account", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingFinAccountCannotBeAuthorized",
                     UtilMisc.toMap("errorString", ex.getMessage()), locale));
@@ -328,7 +328,7 @@ public class FinAccountPaymentServices {
 
             return result;
         } catch (GenericServiceException e) {
-            Debug.logError(e, e.getMessage(), module);
+            Debug.logError(e, e.getMessage(), MODULE);
             return ServiceUtil.returnError(err + e.getMessage());
         }
     }
@@ -360,18 +360,18 @@ public class FinAccountPaymentServices {
             finAccountAuth = EntityQuery.use(delegator).from("FinAccountAuth").where("finAccountAuthId",
                     finAccountAuthId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         Debug.logInfo("Financial account capture [" + finAccountAuth.get("finAccountId") + "] for the amount of $" +
-                amount + " Tx #" + finAccountAuth.get("finAccountAuthId"), module);
+                amount + " Tx #" + finAccountAuth.get("finAccountAuthId"), MODULE);
 
         // get the financial account
         GenericValue finAccount;
         try {
             finAccount = finAccountAuth.getRelatedOne("FinAccount", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -418,7 +418,7 @@ public class FinAccountPaymentServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(releaseResult));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -439,7 +439,7 @@ public class FinAccountPaymentServices {
         try {
             withdrawResp = dispatcher.runSync("finAccountWithdraw", withdrawCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(withdrawResp)) {
@@ -512,7 +512,7 @@ public class FinAccountPaymentServices {
         try {
             depositResp = dispatcher.runSync("finAccountDeposit", depositCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(depositResp)) {
@@ -572,7 +572,7 @@ public class FinAccountPaymentServices {
         try {
             finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -614,7 +614,7 @@ public class FinAccountPaymentServices {
                 balance = finAccount.getBigDecimal("actualBalance");
                 procResult = Boolean.TRUE;
             } catch (GeneralException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -663,7 +663,7 @@ public class FinAccountPaymentServices {
         try {
             finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingFinAccountNotFound", UtilMisc.toMap("finAccountId", finAccountId), locale));
         }
@@ -681,7 +681,7 @@ public class FinAccountPaymentServices {
                     "AccountingFinAccountExpired",
                     UtilMisc.toMap("thruDate", finAccount.getTimestamp("thruDate")), locale));
         }
-        Debug.logInfo("Deposit into financial account #" + finAccountId + " [" + amount + "]", module);
+        Debug.logInfo("Deposit into financial account #" + finAccountId + " [" + amount + "]", MODULE);
 
         // get the previous balance
         BigDecimal previousBalance = finAccount.getBigDecimal("actualBalance");
@@ -698,7 +698,7 @@ public class FinAccountPaymentServices {
             finAccount.refresh();
             actualBalance = finAccount.getBigDecimal("actualBalance");
         } catch (GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -714,7 +714,7 @@ public class FinAccountPaymentServices {
                             finAccountId, "statusId", "FNACT_NEGPENDREPL");
                     dispatcher.addRollbackService("updateFinAccount", rollbackCtx, true);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
             }
@@ -744,7 +744,7 @@ public class FinAccountPaymentServices {
         try {
             finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (finAccount == null) {
@@ -759,7 +759,7 @@ public class FinAccountPaymentServices {
         try {
             finAccountType = finAccount.getRelatedOne("FinAccountType", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         String replenishEnumId = finAccountType.getString("replenishEnumId");
@@ -785,12 +785,12 @@ public class FinAccountPaymentServices {
             finAccountSettings = EntityQuery.use(delegator).from("ProductStoreFinActSetting").where(psfasFindMap)
                     .cache().queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (finAccountSettings == null) {
             Debug.logWarning("finAccountReplenish Warning: not replenishing FinAccount [" + finAccountId
-                    + "] because no ProductStoreFinActSetting record found for: " + psfasFindMap, module);
+                    + "] because no ProductStoreFinActSetting record found for: " + psfasFindMap, MODULE);
             // no settings; don't replenish
             return ServiceUtil.returnSuccess();
         }
@@ -799,14 +799,14 @@ public class FinAccountPaymentServices {
         if (replenishThreshold == null) {
             Debug.logWarning("finAccountReplenish Warning: not replenishing FinAccount [" + finAccountId
                     + "] because ProductStoreFinActSetting.replenishThreshold field was null for: " + psfasFindMap,
-                    module);
+                    MODULE);
             return ServiceUtil.returnSuccess();
         }
 
         BigDecimal replenishLevel = finAccount.getBigDecimal("replenishLevel");
         if (replenishLevel == null || replenishLevel.compareTo(BigDecimal.ZERO) == 0) {
             Debug.logWarning("finAccountReplenish Warning: not replenishing FinAccount [" + finAccountId
-                    + "] because FinAccount.replenishLevel field was null or 0", module);
+                    + "] because FinAccount.replenishLevel field was null or 0", MODULE);
             // no replenish level set; this account goes not support auto-replenish
             return ServiceUtil.returnSuccess();
         }
@@ -818,7 +818,7 @@ public class FinAccountPaymentServices {
         if (balance.compareTo(replenishThreshold) > -1) {
             Debug.logInfo("finAccountReplenish Info: Not replenishing FinAccount [" + finAccountId
                     + "] because balance [" + balance + "] is greater than the replenishThreshold ["
-                    + replenishThreshold + "]", module);
+                    + replenishThreshold + "]", MODULE);
             // not ready
             return ServiceUtil.returnSuccess();
         }
@@ -830,7 +830,7 @@ public class FinAccountPaymentServices {
                         "statusId", "FNACT_NEGPENDREPL");
                 dispatcher.addRollbackService("updateFinAccount", rollbackCtx, true);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -853,7 +853,7 @@ public class FinAccountPaymentServices {
         if (ownerPartyId == null) {
             // no owner cannot replenish; (not fatal, just not supported by this account)
             Debug.logWarning("finAccountReplenish Warning: No owner attached to financial account [" + finAccountId
-                    + "] cannot auto-replenish", module);
+                    + "] cannot auto-replenish", MODULE);
             return ServiceUtil.returnSuccess();
         }
 
@@ -862,7 +862,7 @@ public class FinAccountPaymentServices {
         if (paymentMethodId == null) {
             Debug.logWarning(
                     "finAccountReplenish Warning: No payment method (replenishPaymentId) attached to financial account ["
-                            + finAccountId + "] cannot auto-replenish", module);
+                            + finAccountId + "] cannot auto-replenish", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingFinAccountNoPaymentMethodAssociatedWithReplenishAccount", locale));
         }
@@ -872,13 +872,13 @@ public class FinAccountPaymentServices {
             paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId)
                     .queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (paymentMethod == null) {
             // no payment methods on file; cannot replenish
             Debug.logWarning("finAccountReplenish Warning: No payment method found for ID [" + paymentMethodId
-                    + "] for party [" + ownerPartyId + "] cannot auto-replenish", module);
+                    + "] for party [" + ownerPartyId + "] cannot auto-replenish", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingFinAccountNoPaymentMethodAssociatedWithReplenishAccount", locale));
         }
@@ -896,7 +896,7 @@ public class FinAccountPaymentServices {
         try {
             replResp = dispatcher.runSync("createSimpleNonProductSalesOrder", replOrderCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(replResp)) {
@@ -921,7 +921,7 @@ public class FinAccountPaymentServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(depositResp));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -933,7 +933,7 @@ public class FinAccountPaymentServices {
                     return ServiceUtil.returnError(ServiceUtil.getErrorMessage(ufaResp));
                 }
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -951,7 +951,7 @@ public class FinAccountPaymentServices {
                             EntityCondition.makeCondition("orderId", EntityOperator.NOT_EQUAL, null)).orderBy(
                                     "-transactionDate").queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (trans != null) {
@@ -967,7 +967,7 @@ public class FinAccountPaymentServices {
                 return store.getString("productStoreId");
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         return null;
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java
index 4d1de62..0ca4df2 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountProductServices.java
@@ -50,7 +50,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class FinAccountProductServices {
 
-    public static final String module = FinAccountProductServices.class.getName();
+    public static final String MODULE = FinAccountProductServices.class.getName();
     public static final String resourceOrderError = "OrderErrorUiLabels";
     public static final String resourceError = "AccountingErrorUiLabels";
 
@@ -71,7 +71,7 @@ public class FinAccountProductServices {
         try {
             orderHeader = orderItem.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get OrderHeader from OrderItem", module);
+            Debug.logError(e, "Unable to get OrderHeader from OrderItem", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError,
                     "OrderCannotGetOrderHeader", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -85,7 +85,7 @@ public class FinAccountProductServices {
             featureAndAppls = EntityUtil.filterByDate(featureAndAppls);
             featureAndAppl = EntityUtil.getFirst(featureAndAppls);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -106,7 +106,7 @@ public class FinAccountProductServices {
         try {
             finAccountType = EntityQuery.use(delegator).from("FinAccountType").where("finAccountTypeId", finAccountTypeId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         String replenishEnumId = finAccountType.getString("replenishEnumId");
@@ -128,7 +128,7 @@ public class FinAccountProductServices {
             productStoreId = orh.getProductStoreId();
         }
         if (productStoreId == null) {
-            Debug.logFatal("Unable to create financial accout; no productStoreId on OrderHeader : " + orderId, module);
+            Debug.logFatal("Unable to create financial accout; no productStoreId on OrderHeader : " + orderId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingFinAccountCannotCreate",
                     UtilMisc.toMap("orderId", orderId), locale));
@@ -162,7 +162,7 @@ public class FinAccountProductServices {
             try {
                 party = billToParty.getRelatedOne("Party", false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (party != null) {
                 String partyTypeId = party.getString("partyTypeId");
@@ -213,11 +213,11 @@ public class FinAccountProductServices {
         try {
             createResp = dispatcher.runSync("createFinAccountForStore", createCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(createResp)) {
-            Debug.logFatal(ServiceUtil.getErrorMessage(createResp), module);
+            Debug.logFatal(ServiceUtil.getErrorMessage(createResp), MODULE);
             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(createResp));
         }
 
@@ -234,11 +234,11 @@ public class FinAccountProductServices {
         try {
             roleResp = dispatcher.runSync("createFinAccountRole", roleCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(roleResp)) {
-            Debug.logFatal(ServiceUtil.getErrorMessage(roleResp), module);
+            Debug.logFatal(ServiceUtil.getErrorMessage(roleResp), MODULE);
             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(roleResp));
         }
 
@@ -258,11 +258,11 @@ public class FinAccountProductServices {
         try {
             depositResp = dispatcher.runSync("finAccountDeposit", depositCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(depositResp)) {
-            Debug.logFatal(ServiceUtil.getErrorMessage(depositResp), module);
+            Debug.logFatal(ServiceUtil.getErrorMessage(depositResp), MODULE);
             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(depositResp));
         }
 
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
index f8980d5..64b9fa1 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/finaccount/FinAccountServices.java
@@ -50,7 +50,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class FinAccountServices {
 
-    public static final String module = FinAccountServices.class.getName();
+    public static final String MODULE = FinAccountServices.class.getName();
     public static final String resourceError = "AccountingErrorUiLabels";
 
     public static Map<String, Object> createAccountAndCredit(DispatchContext dctx, Map<String, Object> context) {
@@ -258,7 +258,7 @@ public class FinAccountServices {
             try {
                 finAccount = FinAccountHelper.getFinAccountFromCode(finAccountCode, delegator);
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         } else {
@@ -266,7 +266,7 @@ public class FinAccountServices {
                 finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", finAccountId)
                         .queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -287,7 +287,7 @@ public class FinAccountServices {
 
         String statusId = finAccount.getString("statusId");
         Debug.logInfo("FinAccount Balance [" + balance + "] Available [" + availableBalance + "] - Status: " + statusId,
-                module);
+                MODULE);
 
         Map<String, Object> result = ServiceUtil.returnSuccess();
         result.put("availableBalance", availableBalance);
@@ -324,16 +324,16 @@ public class FinAccountServices {
                 balance = FinAccountHelper.ZERO;
             }
 
-            Debug.logInfo("Account #" + finAccountId + " Balance: " + balance + " Status: " + statusId, module);
+            Debug.logInfo("Account #" + finAccountId + " Balance: " + balance + " Status: " + statusId, MODULE);
 
             if ("FNACT_ACTIVE".equals(statusId) && balance.compareTo(FinAccountHelper.ZERO) < 1) {
                 finAccount.set("statusId", "FNACT_MANFROZEN");
                 Debug.logInfo("Financial account [" + finAccountId + "] has passed its threshold [" + balance
-                        + "] (Frozen)", module);
+                        + "] (Frozen)", MODULE);
             } else if ("FNACT_MANFROZEN".equals(statusId) && balance.compareTo(FinAccountHelper.ZERO) > 0) {
                 finAccount.set("statusId", "FNACT_ACTIVE");
                 Debug.logInfo("Financial account [" + finAccountId + "] has been made current [" + balance
-                        + "] (Un-Frozen)", module);
+                        + "] (Un-Frozen)", MODULE);
             }
             try {
                 finAccount.store();
@@ -492,7 +492,7 @@ public class FinAccountServices {
                         }
                     }
                 } catch (GeneralException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
 
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
index 05b707c..5594a07 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceServices.java
@@ -105,7 +105,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class InvoiceServices {
 
-    public static final String module = InvoiceServices.class.getName();
+    public static final String MODULE = InvoiceServices.class.getName();
 
     // set some BigDecimal properties
     private static final int DECIMALS = UtilNumber.getBigDecimalScale("invoice.decimals");
@@ -141,7 +141,7 @@ public class InvoiceServices {
             return result;
         }
         catch (GenericServiceException | GenericEntityException e) {
-            Debug.logError (e, "Entity/data problem creating invoice from order items: " + e.toString(), module);
+            Debug.logError (e, "Entity/data problem creating invoice from order items: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingEntityDataProblemCreatingInvoiceFromOrderItems",
                     UtilMisc.toMap("reason", e.toString()), locale));
@@ -165,7 +165,7 @@ public class InvoiceServices {
         String invoiceId = (String) context.get("invoiceId");
 
         if (UtilValidate.isEmpty(billItems)) {
-            if (Debug.verboseOn()) Debug.logVerbose("No order items to invoice; not creating invoice; returning success", module);
+            if (Debug.verboseOn()) Debug.logVerbose("No order items to invoice; not creating invoice; returning success", MODULE);
             return ServiceUtil.returnSuccess(UtilProperties.getMessage(resource,
                     "AccountingNoOrderItemsToInvoice", locale));
         }
@@ -331,7 +331,7 @@ public class InvoiceServices {
                         }
                     }
                 } else {
-                    Debug.logWarning("No billing locations found for order [" + orderId +"] and none were created for Invoice [" + invoiceId + "]", module);
+                    Debug.logWarning("No billing locations found for order [" + orderId +"] and none were created for Invoice [" + invoiceId + "]", MODULE);
                 }
             }
 
@@ -379,7 +379,7 @@ public class InvoiceServices {
                 } else if ("ShipmentReceipt".equals(currentValue.getEntityName())) {
                     shipmentReceipt = currentValue;
                 } else {
-                    Debug.logError("Unexpected entity " + currentValue + " of type " + currentValue.getEntityName(), module);
+                    Debug.logError("Unexpected entity " + currentValue + " of type " + currentValue.getEntityName(), MODULE);
                 }
 
                 if (orderItem == null && itemIssuance != null) {
@@ -389,7 +389,7 @@ public class InvoiceServices {
                 }
 
                 if (orderItem == null) {
-                    Debug.logError("Cannot create invoice when orderItem, itemIssuance, and shipmentReceipt are all null", module);
+                    Debug.logError("Cannot create invoice when orderItem, itemIssuance, and shipmentReceipt are all null", MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                             "AccountingIllegalValuesPassedToCreateInvoiceService", locale));
                 }
@@ -545,13 +545,13 @@ public class InvoiceServices {
                     try {
                         Map<String, Object> checkResult = dispatcher.runSync("calculateInvoicedAdjustmentTotal", UtilMisc.toMap("orderAdjustment", adj));
                         if (ServiceUtil.isError(checkResult)) {
-                            Debug.logError("Accounting trouble calling calculateInvoicedAdjustmentTotal service", module);
+                            Debug.logError("Accounting trouble calling calculateInvoicedAdjustmentTotal service", MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                 "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale));
                         }
                         adjAlreadyInvoicedAmount = (BigDecimal) checkResult.get("invoicedTotal");
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", module);
+                        Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", MODULE);
                         return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                 "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale));
                     }
@@ -671,7 +671,7 @@ public class InvoiceServices {
                                     createInvoiceItemAdjContext.put("overrideOrgPartyId", productPromo.getString("overrideOrgPartyId"));
                                 }
                             } catch (GenericEntityException e) {
-                                Debug.logError(e, "Error looking up ProductPromo with id [" + adj.getString("productPromoId") + "]", module);
+                                Debug.logError(e, "Error looking up ProductPromo with id [" + adj.getString("productPromoId") + "]", MODULE);
                             }
                         }
 
@@ -734,7 +734,7 @@ public class InvoiceServices {
                     }
                     adjAlreadyInvoicedAmount = ((BigDecimal) checkResult.get("invoicedTotal")).setScale(invoiceTypeDecimals, ROUNDING);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", module);
+                    Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                             "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService", locale));
                 }
@@ -898,12 +898,12 @@ public class InvoiceServices {
             resp.put("invoiceTypeId", invoiceType);
             return resp;
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Entity/data problem creating invoice from order items: " + e.toString(), module);
+            Debug.logError(e, "Entity/data problem creating invoice from order items: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingEntityDataProblemCreatingInvoiceFromOrderItems",
                     UtilMisc.toMap("reason", e.toString()), locale));
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Service/other problem creating invoice from order items: " + e.toString(), module);
+            Debug.logError(e, "Service/other problem creating invoice from order items: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingServiceOtherProblemCreatingInvoiceFromOrderItems",
                     UtilMisc.toMap("reason", e.toString()), locale));
@@ -923,7 +923,7 @@ public class InvoiceServices {
             List<String> salesRepPartyIds = UtilGenerics.cast(context.get("partyIds"));
             BigDecimal amountTotal =  InvoiceWorker.getInvoiceTotal(delegator, salesInvoiceId);
             if (amountTotal.signum() == 0) {
-                Debug.logWarning("Invoice [" + salesInvoiceId + "] has an amount total of [" + amountTotal + "], so no commission invoice will be created", module);
+                Debug.logWarning("Invoice [" + salesInvoiceId + "] has an amount total of [" + amountTotal + "], so no commission invoice will be created", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingInvoiceCommissionZeroInvoiceAmount", locale));
             }
@@ -960,7 +960,7 @@ public class InvoiceServices {
                 if ("CUST_RTN_INVOICE".equals(invoiceTypeId)) {
                     isReturn = true;
                 } else if (!"SALES_INVOICE".equals(invoiceTypeId)) {
-                    Debug.logWarning("This type of invoice has no commission; returning success", module);
+                    Debug.logWarning("This type of invoice has no commission; returning success", MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                             "AccountingInvoiceCommissionInvalid", locale));
                 }
@@ -1128,7 +1128,7 @@ public class InvoiceServices {
             try {
                 delegator.storeAll(toStore);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Entity/data problem creating commission invoice: " + e.toString(), module);
+                Debug.logError(e, "Entity/data problem creating commission invoice: " + e.toString(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingInvoiceCommissionEntityDataProblem",
                         UtilMisc.toMap("reason", e.toString()), locale));
@@ -1140,7 +1140,7 @@ public class InvoiceServices {
                 "AccountingCommissionInvoicesCreated",
                 UtilMisc.toMap("invoicesCreated", invCreated), locale));
         Debug.logInfo("Created Commission invoices for each commission receiving parties " +
-                invCreated, module);
+                invCreated, MODULE);
         result.put("invoicesCreated", invoicesCreated);
         return result;
     }
@@ -1161,7 +1161,7 @@ public class InvoiceServices {
                 }
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Entity/data problem creating commission invoice: " + e.toString(), module);
+            Debug.logError(e, "Entity/data problem creating commission invoice: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingInvoiceCommissionError",
                     UtilMisc.toMap("reason", e.toString()), locale));
@@ -1213,7 +1213,7 @@ public class InvoiceServices {
                 }
                 invoicesCreated = UtilGenerics.cast(result.get("invoicesCreated"));
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment [" + shipmentId + "]", module);
+                Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment [" + shipmentId + "]", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingTroubleCallingCreateInvoicesFromShipmentService",
                         UtilMisc.toMap("shipmentId", shipmentId), locale));
@@ -1238,13 +1238,13 @@ public class InvoiceServices {
         try {
             shipment = EntityQuery.use(delegator).from("Shipment").where("shipmentId", shipmentId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting Shipment entity for shipment " + shipmentId, module);
+            Debug.logError(e, "Trouble getting Shipment entity for shipment " + shipmentId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingTroubleGettingShipmentEntity",
                     UtilMisc.toMap("shipmentId", shipmentId), locale));
         }
         if (shipment == null) {
-            Debug.logError(UtilProperties.getMessage(resource, "AccountingShipmentNotFound", locale), module);
+            Debug.logError(UtilProperties.getMessage(resource, "AccountingShipmentNotFound", locale), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingShipmentNotFound", locale));
         }
 
@@ -1253,12 +1253,12 @@ public class InvoiceServices {
             itemIssuances = EntityQuery.use(delegator).select("orderId", "shipmentId")
                     .from("ItemIssuance").where("shipmentId", shipmentId).orderBy("orderId").distinct().queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting issued items from shipments", module);
+            Debug.logError(e, "Problem getting issued items from shipments", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingProblemGettingItemsFromShipments", locale));
         }
         if (itemIssuances.size() == 0) {
-            Debug.logInfo("No items issued for shipments", module);
+            Debug.logInfo("No items issued for shipments", MODULE);
             return ServiceUtil.returnSuccess();
         }
         // The orders can now be placed in separate groups, each for
@@ -1275,7 +1275,7 @@ public class InvoiceServices {
             try {
                 orderItemBilling = EntityQuery.use(delegator).from("OrderItemBilling").where(billFields).queryFirst();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Problem looking up OrderItemBilling records for " + billFields, module);
+                Debug.logError(e, "Problem looking up OrderItemBilling records for " + billFields, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingProblemLookingUpOrderItemBilling",
                         UtilMisc.toMap("billFields", billFields), locale));
@@ -1287,7 +1287,7 @@ public class InvoiceServices {
                 try {
                     invoice = orderItemBilling.getRelatedOne("Invoice", false);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
                 if (invoice != null) {
@@ -1305,7 +1305,7 @@ public class InvoiceServices {
             try {
                 setInvoiceStatusResult = dispatcher.runSync("setInvoiceStatus", UtilMisc.<String, Object>toMap("invoiceId", invoiceId, "statusId", "INVOICE_READY", "userLogin", userLogin));
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
             if (ServiceUtil.isError(setInvoiceStatusResult)) {
@@ -1332,7 +1332,7 @@ public class InvoiceServices {
                     UtilMisc.toMap("shipmentId", shipmentId), locale));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment " + shipmentId, module);
+            Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment " + shipmentId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingTroubleCallingCreateInvoicesFromShipmentService",
                     UtilMisc.toMap("shipmentId", shipmentId), locale));
@@ -1375,7 +1375,7 @@ public class InvoiceServices {
                             locale));
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting Shipment entity for shipment " + tmpShipmentId, module);
+                Debug.logError(e, "Trouble getting Shipment entity for shipment " + tmpShipmentId, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingTroubleGettingShipmentEntity",
                         UtilMisc.toMap("tmpShipmentId", tmpShipmentId), locale));
@@ -1428,12 +1428,12 @@ public class InvoiceServices {
                 items = shipmentQuery.from("ItemIssuance").queryList();
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting issued items from shipments", module);
+            Debug.logError(e, "Problem getting issued items from shipments", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingProblemGettingItemsFromShipments", locale));
         }
         if (items.size() == 0) {
-            Debug.logInfo("No items issued for shipments", module);
+            Debug.logInfo("No items issued for shipments", MODULE);
             return ServiceUtil.returnSuccess();
         }
 
@@ -1468,7 +1468,7 @@ public class InvoiceServices {
             try {
                 itemBillings = EntityQuery.use(delegator).from("OrderItemBillingAndInvoiceAndItem").where(billFields).queryList();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Problem looking up OrderItemBilling records for " + billFields, module);
+                Debug.logError(e, "Problem looking up OrderItemBilling records for " + billFields, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingProblemLookingUpOrderItemBilling",
                         UtilMisc.toMap("billFields", billFields), locale));
@@ -1530,7 +1530,7 @@ public class InvoiceServices {
                         }
                         billed = EntityQuery.use(delegator).from("OrderItemBillingAndInvoiceAndItem").where(lookup).queryList();
                     } catch (GenericEntityException e) {
-                        Debug.logError(e, "Problem getting OrderItem/OrderItemBilling records " + lookup, module);
+                        Debug.logError(e, "Problem getting OrderItem/OrderItemBilling records " + lookup, MODULE);
                         return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                 "AccountingProblemGettingOrderItemOrderItemBilling",
                                 UtilMisc.toMap("lookup", lookup), locale));
@@ -1627,7 +1627,7 @@ public class InvoiceServices {
                         }
                     }
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, "Trouble calling createInvoicesFromShipments service", module);
+                    Debug.logError(e, "Trouble calling createInvoicesFromShipments service", MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                             "AccountingTroubleCallingCreateInvoicesFromShipmentsService", locale));
                 }
@@ -1673,7 +1673,7 @@ public class InvoiceServices {
                             }
                             shippingOrderAdjustmentId = (String) createOrderAdjustmentResult.get("orderAdjustmentId");
                         } catch (GenericServiceException e) {
-                            Debug.logError(e, "Trouble calling createOrderAdjustment service", module);
+                            Debug.logError(e, "Trouble calling createOrderAdjustment service", MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                     "AccountingTroubleCallingCreateOrderAdjustmentService", locale));
                         }
@@ -1685,7 +1685,7 @@ public class InvoiceServices {
                         try {
                             destinationContactMech = shipment.getRelatedOne("DestinationPostalAddress", false);
                         } catch (GenericEntityException e) {
-                            Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment " + shipmentId, module);
+                            Debug.logError(e, "Trouble calling createInvoicesFromShipment service; invoice not created for shipment " + shipmentId, MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                     "AccountingTroubleCallingCreateInvoicesFromShipmentService", locale));
                         }
@@ -1713,7 +1713,7 @@ public class InvoiceServices {
                                     "AccountingTroubleCallingCalcTaxService", locale));
                             }
                         } catch (GenericServiceException e) {
-                            Debug.logError(e, "Trouble calling calcTaxService", module);
+                            Debug.logError(e, "Trouble calling calcTaxService", MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                     "AccountingTroubleCallingCalcTaxService", locale));
                         }
@@ -1732,7 +1732,7 @@ public class InvoiceServices {
                             try {
                                 delegator.storeAll(orderAdjustments);
                             } catch (GenericEntityException e) {
-                                Debug.logError(e, "Problem storing OrderAdjustments: " + orderAdjustments, module);
+                                Debug.logError(e, "Problem storing OrderAdjustments: " + orderAdjustments, MODULE);
                                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                         "AccountingProblemStoringOrderAdjustments",
                                         UtilMisc.toMap("orderAdjustments", orderAdjustments), locale));
@@ -1745,7 +1745,7 @@ public class InvoiceServices {
                             orderPaymentPreferences = EntityQuery.use(delegator).from("OrderPaymentPreference")
                                     .where("orderId", orderId, "paymentMethodTypeId", "CREDIT_CARD").queryList();
                         } catch (GenericEntityException e) {
-                            Debug.logError(e, "Problem getting OrderPaymentPreference records", module);
+                            Debug.logError(e, "Problem getting OrderPaymentPreference records", MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                     "AccountingProblemGettingOrderPaymentPreferences", locale));
                         }
@@ -1776,13 +1776,13 @@ public class InvoiceServices {
                                         try {
                                             prefReleaseResult = dispatcher.runSync("releaseOrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", orderPaymentPreference.getString("orderPaymentPreferenceId"), "userLogin", context.get("userLogin")));
                                         } catch (GenericServiceException e) {
-                                            Debug.logError(e, "Trouble calling releaseOrderPaymentPreference service", module);
+                                            Debug.logError(e, "Trouble calling releaseOrderPaymentPreference service", MODULE);
                                             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                                     "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale));
                                         }
                                         if (ServiceUtil.isError(prefReleaseResult) || ServiceUtil.isFailure(prefReleaseResult)) {
                                             String errMsg = ServiceUtil.getErrorMessage(prefReleaseResult);
-                                            Debug.logError(errMsg, module);
+                                            Debug.logError(errMsg, MODULE);
                                             return ServiceUtil.returnError(errMsg);
                                         }
                                     }
@@ -1801,7 +1801,7 @@ public class InvoiceServices {
                                 }
                                 orderPaymentPreferenceId = (String) result.get("orderPaymentPreferenceId");
                             } catch (GenericServiceException e) {
-                                Debug.logError(e, "Trouble calling createOrderPaymentPreference service", module);
+                                Debug.logError(e, "Trouble calling createOrderPaymentPreference service", MODULE);
                                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                         "AccountingTroubleCallingCreateOrderPaymentPreferenceService", locale));
                             }
@@ -1816,7 +1816,7 @@ public class InvoiceServices {
                                         "AccountingTroubleCallingAuthOrderPaymentPreferenceService", locale));
                                 }
                             } catch (GenericServiceException e) {
-                                Debug.logError(e, "Trouble calling authOrderPaymentPreference service", module);
+                                Debug.logError(e, "Trouble calling authOrderPaymentPreference service", MODULE);
                                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                                         "AccountingTroubleCallingAuthOrderPaymentPreferenceService", locale));
                             }
@@ -1826,14 +1826,14 @@ public class InvoiceServices {
                             boolean authErrors = (Boolean) authResult.get("errors");
                             if (authErrors || ! authFinished) {
                                 String errMsg = UtilProperties.getMessage(resource, "AccountingUnableToAuthAdditionalShipCharges", UtilMisc.toMap("shipmentId", shipmentId, "paymentMethodId", paymentMethodId, "orderPaymentPreferenceId", orderPaymentPreferenceId), locale);
-                                Debug.logError(errMsg, module);
+                                Debug.logError(errMsg, MODULE);
                             }
 
                         }
                     }
                 }
             } else {
-                Debug.logInfo(UtilProperties.getMessage(resource, "AccountingIgnoringAdditionalShipCharges", UtilMisc.toMap("productStoreId", orh.getProductStoreId()), locale), module);
+                Debug.logInfo(UtilProperties.getMessage(resource, "AccountingIgnoringAdditionalShipCharges", UtilMisc.toMap("productStoreId", orh.getProductStoreId()), locale), MODULE);
             }
 
             String invoiceId = null;
@@ -1859,7 +1859,7 @@ public class InvoiceServices {
                 }
                 invoicesCreated.add((String) result.get("invoiceId"));
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Trouble calling createInvoiceForOrder service; invoice not created for shipment", module);
+                Debug.logError(e, "Trouble calling createInvoiceForOrder service; invoice not created for shipment", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingTroubleCallingCreateInvoiceForOrderService", locale));
             }
@@ -1880,7 +1880,7 @@ public class InvoiceServices {
                 itemMap = EntityQuery.use(delegator).from("InvoiceItemTypeMap").where("invoiceItemMapKey", key2, "invoiceTypeId", invoiceTypeId).cache().queryOne();
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceItemTypeMap entity record", module);
+            Debug.logError(e, "Trouble getting InvoiceItemTypeMap entity record", MODULE);
             return defaultValue;
         }
         if (itemMap != null) {
@@ -1926,7 +1926,7 @@ public class InvoiceServices {
                 shippedItems = shipment.getRelated("ItemIssuance", null, null, false);
             }
             if (shippedItems == null) {
-                Debug.logInfo("No items issued for shipments", module);
+                Debug.logInfo("No items issued for shipments", MODULE);
                 return ServiceUtil.returnSuccess();
             }
 
@@ -1978,7 +1978,7 @@ public class InvoiceServices {
                 String returnId = entry.getKey();
                 List<GenericValue> billItems = entry.getValue();
                 if (Debug.verboseOn()) {
-                    Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), module);
+                    Debug.logVerbose("Creating invoice for return [" + returnId + "] with items: " + billItems.toString(), MODULE);
                 }
                 Map<String, Object> input = UtilMisc.toMap("returnId", returnId, "billItems", billItems, "userLogin", context.get("userLogin"));
                 Map<String, Object> serviceResults = dispatcher.runSync("createInvoiceFromReturn", input);
@@ -1990,7 +1990,7 @@ public class InvoiceServices {
                 invoicesCreated.add((String) serviceResults.get("invoiceId"));
             }
         } catch (GenericServiceException | GenericEntityException e) {
-            Debug.logError(e, errorMsg + e.getMessage(), module);
+            Debug.logError(e, errorMsg + e.getMessage(), MODULE);
             return ServiceUtil.returnError(errorMsg + e.getMessage());
         }
 
@@ -2097,7 +2097,7 @@ public class InvoiceServices {
                     quantity = item.getBigDecimal("returnQuantity");
                     returnItem = item;
                 } else {
-                    Debug.logError("Unexpected entity " + item + " of type " + item.getEntityName(), module);
+                    Debug.logError("Unexpected entity " + item + " of type " + item.getEntityName(), MODULE);
                 }
                 // we need the related return item and product
                 if (shipmentReceiptFound) {
@@ -2159,7 +2159,7 @@ public class InvoiceServices {
                 }
                 if (Debug.verboseOn()) {
                     Debug.logVerbose("Creating Invoice Item with amount " + returnPrice + " and quantity " + quantity
-                            + " for shipment [" + item.getString("shipmentId") + ":" + item.getString("shipmentItemSeqId") + "]", module);
+                            + " for shipment [" + item.getString("shipmentId") + ":" + item.getString("shipmentItemSeqId") + "]", MODULE);
                 }
 
                 String parentInvoiceItemSeqId = invoiceItemSeqId;
@@ -2187,7 +2187,7 @@ public class InvoiceServices {
                 for (GenericValue adjustment : adjustments) {
 
                     if (adjustment.get("amount") == null) {
-                         Debug.logWarning("Return adjustment [" + adjustment.get("returnAdjustmentId") + "] has null amount and will be skipped", module);
+                         Debug.logWarning("Return adjustment [" + adjustment.get("returnAdjustmentId") + "] has null amount and will be skipped", MODULE);
                          continue;
                     }
 
@@ -2205,7 +2205,7 @@ public class InvoiceServices {
                     amount = amount.multiply(ratio).setScale(DECIMALS, ROUNDING);
                     if (Debug.verboseOn()) {
                         Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount
-                                + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module);
+                                + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", MODULE);
                     }
 
                     // prepare invoice item data for this adjustment
@@ -2265,7 +2265,7 @@ public class InvoiceServices {
                 BigDecimal amount = adjustment.getBigDecimal("amount").multiply(actualToPromisedRatio).setScale(DECIMALS, ROUNDING);
                 if (Debug.verboseOn()) {
                     Debug.logVerbose("Creating Invoice Item with amount " + adjustment.getBigDecimal("amount") + " prorated to " + amount
-                            + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", module);
+                            + " for return adjustment [" + adjustment.getString("returnAdjustmentId") + "]", MODULE);
                 }
 
                 // prepare the invoice item for the return-wide adjustment
@@ -2303,7 +2303,7 @@ public class InvoiceServices {
             }
             return results;
         } catch (GenericServiceException | GenericEntityException e) {
-            Debug.logError(e, errorMsg + e.getMessage(), module);
+            Debug.logError(e, errorMsg + e.getMessage(), MODULE);
             return ServiceUtil.returnError(errorMsg + e.getMessage());
         }
     }
@@ -2324,7 +2324,7 @@ public class InvoiceServices {
         try {
             invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Invoice for Invoice ID" + invoiceId, module);
+            Debug.logError(e, "Problem getting Invoice for Invoice ID" + invoiceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingInvoiceNotFound", UtilMisc.toMap("invoiceId", invoiceId), locale));
         }
@@ -2351,7 +2351,7 @@ public class InvoiceServices {
                 iter.remove();
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting PaymentApplication(s) for Invoice ID " + invoiceId, module);
+            Debug.logError(e, "Problem getting PaymentApplication(s) for Invoice ID " + invoiceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingProblemGettingPaymentApplication",
                     UtilMisc.toMap("invoiceId", invoiceId), locale));
@@ -2382,8 +2382,8 @@ public class InvoiceServices {
         if (totalPayments.signum() == 1) {
             BigDecimal invoiceTotal = InvoiceWorker.getInvoiceTotal(delegator, invoiceId);
             if (Debug.verboseOn()) {
-                Debug.logVerbose("Invoice #" + invoiceId + " total: " + invoiceTotal, module);
-                Debug.logVerbose("Total payments : " + totalPayments, module);
+                Debug.logVerbose("Invoice #" + invoiceId + " total: " + invoiceTotal, MODULE);
+                Debug.logVerbose("Total payments : " + totalPayments, MODULE);
             }
             if (totalPayments.compareTo(invoiceTotal) >= 0) { // this checks that totalPayments is greater than or equal to invoiceTotal
                 // this invoice is paid
@@ -2397,14 +2397,14 @@ public class InvoiceServices {
                             UtilMisc.toMap("newStatus", "INVOICE_PAID"), locale));
                     }
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Problem changing invoice status to INVOICE_PAID" + svcCtx, module);
+                    Debug.logError(e, "Problem changing invoice status to INVOICE_PAID" + svcCtx, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                             "AccountingProblemChangingInvoiceStatusTo",
                             UtilMisc.toMap("newStatus", "INVOICE_PAID"), locale));
                 }
             }
         } else {
-            Debug.logInfo("No payments found for Invoice #" + invoiceId, module);
+            Debug.logInfo("No payments found for Invoice #" + invoiceId, MODULE);
         }
 
         return ServiceUtil.returnSuccess();
@@ -2441,7 +2441,7 @@ public class InvoiceServices {
                 try {
                     createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", module);
+                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", MODULE);
                     return adjAmount;
                 }
                 if (ServiceUtil.isError(createInvoiceItemResult)) {
@@ -2496,7 +2496,7 @@ public class InvoiceServices {
                 try {
                     createInvoiceItemResult = dispatcher.runSync("createInvoiceItem", createInvoiceItemContext);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", module);
+                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", MODULE);
                     return adjAmount;
                 }
                 if (ServiceUtil.isError(createInvoiceItemResult)) {
@@ -2527,7 +2527,7 @@ public class InvoiceServices {
 
         Debug.logInfo("adjAmount: " + adjAmount + ", divisor: " + divisor + ", multiplier: " + multiplier +
                 ", invoiceTypeId: " + invoiceTypeId + ", invoiceId: " + invoiceId + ", itemSeqId: " + invoiceItemSeqId +
-                ", decimals: " + decimals + ", rounding: " + rounding + ", adj: " + adj, module);
+                ", decimals: " + decimals + ", rounding: " + rounding + ", adj: " + adj, MODULE);
         return adjAmount;
     }
 
@@ -2553,10 +2553,10 @@ public class InvoiceServices {
                 try {
                     createInvoiceTermResult = dispatcher.runSync("createInvoiceTerm", createInvoiceTermContext);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", module);
+                    Debug.logError(e, "Service/other problem creating InvoiceItem from order header adjustment", MODULE);
                 }
                 if (ServiceUtil.isError(createInvoiceTermResult)) {
-                    Debug.logError("Service/other problem creating InvoiceItem from order header adjustment", module);
+                    Debug.logError("Service/other problem creating InvoiceItem from order header adjustment", MODULE);
                 }
             }
         }
@@ -2640,7 +2640,7 @@ public class InvoiceServices {
                     " BillingAccountId: " + billingAccountId +
                     " toPaymentId: " + toPaymentId +
                     " amountApplied: " + amountApplied +
-                    " TaxAuthGeoId: " + taxAuthGeoId, module);
+                    " TaxAuthGeoId: " + taxAuthGeoId, MODULE);
         }
 
         if (changeProcessing == null) {
@@ -2778,7 +2778,7 @@ public class InvoiceServices {
             }
 
             if (debug) {
-                Debug.logInfo("toPayment info retrieved and checked...", module);
+                Debug.logInfo("toPayment info retrieved and checked...", MODULE);
             }
         }
 
@@ -2824,7 +2824,7 @@ public class InvoiceServices {
             }
 
             if (debug) {
-                Debug.logInfo("Billing Account info retrieved and checked...", module);
+                Debug.logInfo("Billing Account info retrieved and checked...", MODULE);
             }
         }
 
@@ -2856,8 +2856,8 @@ public class InvoiceServices {
                 if (currencyUomId != null && invoice.get("currencyUomId") != null &&
                         !currencyUomId.equals(invoice.getString("currencyUomId"))) {
                     Debug.logInfo(UtilProperties.getMessage(resource, "AccountingInvoicePaymentCurrencyProblem",
-                            UtilMisc.toMap("invoiceCurrency", invoice.getString("currencyUomId"), "paymentCurrency", payment.getString("currencyUomId")),locale), module);
-                    Debug.logInfo("will try to apply payment on the actualCurrency amount on payment", module);
+                            UtilMisc.toMap("invoiceCurrency", invoice.getString("currencyUomId"), "paymentCurrency", payment.getString("currencyUomId")),locale), MODULE);
+                    Debug.logInfo("will try to apply payment on the actualCurrency amount on payment", MODULE);
 
                     if (payment.get("actualCurrencyAmount") == null || payment.get("actualCurrencyUomId") == null) {
                         errorMessageList.add("Actual amounts are required in the currency of the invoice to make this work....");
@@ -2902,7 +2902,7 @@ public class InvoiceServices {
                 }
 
                 if (debug) {
-                    Debug.logInfo("Invoice info retrieved and checked ...", module);
+                    Debug.logInfo("Invoice info retrieved and checked ...", MODULE);
                 }
             }
 
@@ -2947,7 +2947,7 @@ public class InvoiceServices {
                     }
                 }
                 if (debug) {
-                    Debug.logInfo("InvoiceItem info retrieved and checked against the Invoice (currency and amounts) ...", module);
+                    Debug.logInfo("InvoiceItem info retrieved and checked against the Invoice (currency and amounts) ...", MODULE);
                 }
             }
         }
@@ -3142,7 +3142,7 @@ public class InvoiceServices {
                 }
             }
             if (debug) {
-                Debug.logInfo("paymentApplication record info retrieved and checked...", module);
+                Debug.logInfo("paymentApplication record info retrieved and checked...", MODULE);
             }
         }
 
@@ -3153,9 +3153,9 @@ public class InvoiceServices {
             if (invoiceItemSeqId != null) {
                 extra = " Invoice item(" + invoiceItemSeqId + ") amount not yet applied: " + newInvoiceItemApplyAvailable;
             }
-            Debug.logInfo("checking finished, start processing with the following data... ", module);
+            Debug.logInfo("checking finished, start processing with the following data... ", MODULE);
             if (invoiceId != null) {
-                Debug.logInfo(" Invoice(" + invoiceId + ") amount not yet applied: " + newInvoiceApplyAvailable + extra + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable +  " Requested amount to apply:" + amountApplied, module);
+                Debug.logInfo(" Invoice(" + invoiceId + ") amount not yet applied: " + newInvoiceApplyAvailable + extra + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable +  " Requested amount to apply:" + amountApplied, MODULE);
                 toMessage = UtilProperties.getMessage(resource,
                         "AccountingApplicationToInvoice",
                         UtilMisc.toMap("invoiceId", invoiceId), locale);
@@ -3166,13 +3166,13 @@ public class InvoiceServices {
                 }
             }
             if (toPaymentId != null) {
-                Debug.logInfo(" toPayment(" + toPaymentId + ") amount not yet applied: " + newToPaymentApplyAvailable + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module);
+                Debug.logInfo(" toPayment(" + toPaymentId + ") amount not yet applied: " + newToPaymentApplyAvailable + " Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, MODULE);
                 toMessage = UtilProperties.getMessage(resource,
                         "AccountingApplicationToPayment",
                         UtilMisc.toMap("paymentId", toPaymentId), locale);
             }
             if (taxAuthGeoId != null) {
-                Debug.logInfo(" taxAuthGeoId(" + taxAuthGeoId + ")  Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, module);
+                Debug.logInfo(" taxAuthGeoId(" + taxAuthGeoId + ")  Payment(" + paymentId + ") amount not yet applied: " + newPaymentApplyAvailable + " Requested amount to apply:" + amountApplied, MODULE);
                 toMessage = UtilProperties.getMessage(resource,
                         "AccountingApplicationToTax",
                         UtilMisc.toMap("taxAuthGeoId", taxAuthGeoId), locale);
@@ -3216,7 +3216,7 @@ public class InvoiceServices {
         if (paymentApplicationId != null) {
             // record is already retrieved previously
             if (debug) {
-                Debug.logInfo("Process an existing paymentApplication record: " + paymentApplicationId, module);
+                Debug.logInfo("Process an existing paymentApplication record: " + paymentApplicationId, MODULE);
             }
             // update the current record
             paymentApplication.set("invoiceId", invoiceId);
@@ -3236,7 +3236,7 @@ public class InvoiceServices {
             if (invoiceProcessing) {
                 // create only a single record with a null seqId
                 if (debug) {
-                    Debug.logInfo("Try to allocate the payment to the invoice as a whole", module);
+                    Debug.logInfo("Try to allocate the payment to the invoice as a whole", MODULE);
                 }
                 paymentApplication.set("paymentId", paymentId);
                 paymentApplication.set("toPaymentId",null);
@@ -3247,12 +3247,12 @@ public class InvoiceServices {
                 paymentApplication.set("billingAccountId", billingAccountId);
                 paymentApplication.set("taxAuthGeoId", null);
                 if (debug) {
-                    Debug.logInfo("creating new paymentapplication", module);
+                    Debug.logInfo("creating new paymentapplication", MODULE);
                 }
                 return storePaymentApplication(delegator, paymentApplication,locale);
             }
             if (debug) {
-                Debug.logInfo("Try to allocate the payment to the itemnumbers of the invoice", module);
+                Debug.logInfo("Try to allocate the payment to the itemnumbers of the invoice", MODULE);
             }
             // get the invoice items
             List<GenericValue> invoiceItems = null;
@@ -3274,7 +3274,7 @@ public class InvoiceServices {
                     break;
                 }
                 if (debug) {
-                    Debug.logInfo("Start processing item: " + currentInvoiceItem.getString("invoiceItemSeqId"), module);
+                    Debug.logInfo("Start processing item: " + currentInvoiceItem.getString("invoiceItemSeqId"), MODULE);
                 }
                 BigDecimal itemQuantity = BigDecimal.ONE;
                 if (currentInvoiceItem.get("quantity") != null && currentInvoiceItem.getBigDecimal("quantity").signum() != 0) {
@@ -3307,7 +3307,7 @@ public class InvoiceServices {
                     tobeApplied = itemTotal;
                 }
                 if (debug) {
-                    Debug.logInfo("tobeApplied:(" + tobeApplied + ") = " + "itemTotal(" + itemTotal + ") - alreadyApplied(" + alreadyApplied + ") but not more then (nonapplied) paymentAmount(" + paymentApplyAvailable + ")", module);
+                    Debug.logInfo("tobeApplied:(" + tobeApplied + ") = " + "itemTotal(" + itemTotal + ") - alreadyApplied(" + alreadyApplied + ") but not more then (nonapplied) paymentAmount(" + paymentApplyAvailable + ")", MODULE);
                 }
 
                 if (tobeApplied.signum() == 0) {
@@ -3375,7 +3375,7 @@ public class InvoiceServices {
         try {
             invoicedAdjustments = EntityQuery.use(delegator).from("OrderAdjustmentBilling").where("orderAdjustmentId", orderAdjustment.get("orderAdjustmentId")).queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", module);
+            Debug.logError(e, "Accounting trouble calling calculateInvoicedAdjustmentTotal service", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingTroubleCallingCalculateInvoicedAdjustmentTotalService" + ": " + e.getMessage(), locale));
         }
@@ -3399,7 +3399,7 @@ public class InvoiceServices {
                 "AccountingSuccessful", locale));
         boolean debug = true;
         if (debug) {
-            Debug.logInfo("Start updating the paymentApplication table ", module);
+            Debug.logInfo("Start updating the paymentApplication table ", MODULE);
         }
 
         if (DECIMALS == -1 || ROUNDING == null) {
@@ -3423,7 +3423,7 @@ public class InvoiceServices {
         }
         if (checkAppls.size() > 0) {
             if (debug) {
-                Debug.logInfo(checkAppls.size() + " records already exist", module);
+                Debug.logInfo(checkAppls.size() + " records already exist", MODULE);
             }
             // 1 record exists just update and if different ID delete other record and add together.
             GenericValue checkAppl = checkAppls.get(0);
@@ -3433,7 +3433,7 @@ public class InvoiceServices {
                 checkAppl.set("amountApplied", paymentApplication.getBigDecimal("amountApplied").
                         add(checkAppl.getBigDecimal("amountApplied")).setScale(DECIMALS,ROUNDING));
                 if (debug) {
-                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), module);
+                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), MODULE);
                 }
                 try {
                     checkAppl.store();
@@ -3444,7 +3444,7 @@ public class InvoiceServices {
                 // update existing record in-place
                 checkAppl.set("amountApplied", paymentApplication.getBigDecimal("amountApplied"));
                 if (debug) {
-                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), module);
+                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), MODULE);
                 }
                 try {
                     checkAppl.store();
@@ -3457,7 +3457,7 @@ public class InvoiceServices {
                         add(checkAppl.getBigDecimal("amountApplied")).setScale(DECIMALS,ROUNDING));
                 // delete paymentApplication record and update the checkAppls one.
                 if (debug) {
-                    Debug.logInfo("Delete paymentApplication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), module);
+                    Debug.logInfo("Delete paymentApplication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), MODULE);
                 }
                 try {
                     paymentApplication.remove();
@@ -3466,7 +3466,7 @@ public class InvoiceServices {
                 }
                 // update amount existing record
                 if (debug) {
-                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), module);
+                    Debug.logInfo("Update paymentApplication record: " + checkAppl.getString("paymentApplicationId") + " with appliedAmount:" + checkAppl.getBigDecimal("amountApplied"), MODULE);
                 }
                 try {
                     checkAppl.store();
@@ -3476,13 +3476,13 @@ public class InvoiceServices {
             }
         } else {
             if (debug) {
-                Debug.logInfo("No records found with paymentId,invoiceid..etc probaly changed one of them...", module);
+                Debug.logInfo("No records found with paymentId,invoiceid..etc probaly changed one of them...", MODULE);
             }
             // create record if ID null;
             if (paymentApplication.get("paymentApplicationId") == null) {
                 paymentApplication.set("paymentApplicationId", delegator.getNextSeqId("PaymentApplication"));
                     if (debug) {
-                        Debug.logInfo("Create new paymentAppication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), module);
+                        Debug.logInfo("Create new paymentAppication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), MODULE);
                     }
                 try {
                     paymentApplication.create();
@@ -3492,7 +3492,7 @@ public class InvoiceServices {
             } else {
                 // update existing record (could not be found because a non existing combination of paymentId/invoiceId/invoiceSeqId/ etc... was provided
                 if (debug) {
-                    Debug.logInfo("Update existing paymentApplication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), module);
+                    Debug.logInfo("Update existing paymentApplication record: " + paymentApplication.getString("paymentApplicationId") + " with appliedAmount:" + paymentApplication.getBigDecimal("amountApplied"), MODULE);
                 }
                 try {
                     paymentApplication.store();
@@ -3533,7 +3533,7 @@ public class InvoiceServices {
             }
             return ServiceUtil.returnSuccess();
         } catch (GenericServiceException | GenericEntityException se) {
-            Debug.logError(se, se.getMessage(), module);
+            Debug.logError(se, se.getMessage(), MODULE);
             return ServiceUtil.returnError(se.getMessage());
         }
     }
@@ -3616,7 +3616,7 @@ public class InvoiceServices {
 
 
                     } catch (GenericEntityException e) {
-                        Debug.logError("Valication checking problem against database. due to " + e.getMessage(), module);
+                        Debug.logError("Valication checking problem against database. due to " + e.getMessage(), MODULE);
                     }
 
                     if (newErrMsgs.size() > 0) {
@@ -3630,7 +3630,7 @@ public class InvoiceServices {
                             }
                         } catch (GenericServiceException e) {
                             csvReader.close();
-                            Debug.logError(e, module);
+                            Debug.logError(e, MODULE);
                             return ServiceUtil.returnError(e.getMessage());
                         }
                         newInvoiceId = (String) invoiceResult.get("invoiceId");
@@ -3676,7 +3676,7 @@ public class InvoiceServices {
                             newErrMsgs.add("Line number " + rec.getRecordNumber() + ": Either or both quantity and amount is required for invoice: " + currentInvoiceId + " Item seqId:" + invoiceItem.get("invoiceItemSeqId"));
                         }
                     } catch (GenericEntityException e) {
-                        Debug.logError("Validation checking problem against database. due to " + e.getMessage(), module);
+                        Debug.logError("Validation checking problem against database. due to " + e.getMessage(), MODULE);
                     }
 
                     if (newErrMsgs.size() > 0) {
@@ -3689,7 +3689,7 @@ public class InvoiceServices {
                             }
                         } catch (GenericServiceException e) {
                             csvReader.close();
-                            Debug.logError(e, module);
+                            Debug.logError(e, MODULE);
                             return ServiceUtil.returnError(e.getMessage());
                         }
                     }
@@ -3697,7 +3697,7 @@ public class InvoiceServices {
             }
 
         } catch (IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
index 34aa9b1..270cafa 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/invoice/InvoiceWorker.java
@@ -54,7 +54,7 @@ import org.apache.ofbiz.service.LocalDispatcher;
  */
 public final class InvoiceWorker {
 
-    public static final String module = InvoiceWorker.class.getName();
+    public static final String MODULE = InvoiceWorker.class.getName();
     private static final int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static final RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     private static final int taxDecimals = UtilNumber.getBigDecimalScale("salestax.calc.decimals");
@@ -90,7 +90,7 @@ public final class InvoiceWorker {
         try {
             invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Invoice", module);
+            Debug.logError(e, "Problem getting Invoice", MODULE);
         }
 
         if (invoice == null) {
@@ -219,7 +219,7 @@ public final class InvoiceWorker {
                             EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.NOT_IN, getTaxableInvoiceItemTypeIds(invoice.getDelegator()))
                     ));
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceItem list", module);
+            Debug.logError(e, "Trouble getting InvoiceItem list", MODULE);
         }
         if (invoiceItems != null) {
             for (GenericValue invoiceItem : invoiceItems) {
@@ -245,7 +245,7 @@ public final class InvoiceWorker {
                 return billToParty;
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting Party from Invoice", module);
+            Debug.logError(e, "Trouble getting Party from Invoice", MODULE);
         }
 
         // remaining code is the old method, which we leave here for compatibility purposes
@@ -253,7 +253,7 @@ public final class InvoiceWorker {
         try {
             billToRoles = invoice.getRelated("InvoiceRole", UtilMisc.toMap("roleTypeId", "BILL_TO_CUSTOMER"), UtilMisc.toList("-datetimePerformed"), false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceRole list", module);
+            Debug.logError(e, "Trouble getting InvoiceRole list", MODULE);
         }
 
         if (billToRoles != null) {
@@ -262,7 +262,7 @@ public final class InvoiceWorker {
             try {
                 party = role.getRelatedOne("Party", false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting Party from InvoiceRole", module);
+                Debug.logError(e, "Trouble getting Party from InvoiceRole", MODULE);
             }
             if (party != null) {
                 return party;
@@ -276,7 +276,7 @@ public final class InvoiceWorker {
         try {
             return invoice.getRelatedOne("FromParty", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting FromParty from Invoice", module);
+            Debug.logError(e, "Trouble getting FromParty from Invoice", MODULE);
         }
         return null;
     }
@@ -297,7 +297,7 @@ public final class InvoiceWorker {
         try {
             sendFromRoles = invoice.getRelated("InvoiceRole", UtilMisc.toMap("roleTypeId", "BILL_FROM_VENDOR"), UtilMisc.toList("-datetimePerformed"), false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceRole list", module);
+            Debug.logError(e, "Trouble getting InvoiceRole list", MODULE);
         }
 
         if (sendFromRoles != null) {
@@ -306,7 +306,7 @@ public final class InvoiceWorker {
             try {
                 party = role.getRelatedOne("Party", false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting Party from InvoiceRole", module);
+                Debug.logError(e, "Trouble getting Party from InvoiceRole", MODULE);
             }
             if (party != null) {
                 return party;
@@ -334,7 +334,7 @@ public final class InvoiceWorker {
                     postalAddress = shipment.getRelatedOne("DestinationPostalAddress", false);
                 }
             } catch (GenericEntityException e) {
-                Debug.logError("Touble getting ContactMech entity from OISG", module);
+                Debug.logError("Touble getting ContactMech entity from OISG", MODULE);
             }
         }
         return postalAddress;
@@ -369,7 +369,7 @@ public final class InvoiceWorker {
         try {
             locations = invoice.getRelated("InvoiceContactMech", UtilMisc.toMap("contactMechPurposeTypeId", contactMechPurposeTypeId), null, false);
         } catch (GenericEntityException e) {
-            Debug.logError("Touble getting InvoiceContactMech entity list", module);
+            Debug.logError("Touble getting InvoiceContactMech entity list", MODULE);
         }
 
         if (UtilValidate.isEmpty(locations) && fetchPartyAddress)    {
@@ -388,7 +388,7 @@ public final class InvoiceWorker {
                 locations = EntityUtil.filterByDate(locations, now, "contactFromDate", "contactThruDate", true);
                 locations = EntityUtil.filterByDate(locations, now, "purposeFromDate", "purposeThruDate", true);
             } catch (GenericEntityException e) {
-                Debug.logError("Trouble getting contact party purpose list", module);
+                Debug.logError("Trouble getting contact party purpose list", MODULE);
             }
             //if still not found get it from the general location
             if (UtilValidate.isEmpty(locations))    {
@@ -398,7 +398,7 @@ public final class InvoiceWorker {
                     locations = EntityUtil.filterByDate(locations, now, "contactFromDate", "contactThruDate", true);
                     locations = EntityUtil.filterByDate(locations, now, "purposeFromDate", "purposeThruDate", true);
                 } catch (GenericEntityException e) {
-                    Debug.logError("Trouble getting contact party purpose list", module);
+                    Debug.logError("Trouble getting contact party purpose list", MODULE);
                 }
             }
         }
@@ -410,7 +410,7 @@ public final class InvoiceWorker {
             try {
                 contactMech = locations.get(0).getRelatedOne("ContactMech", false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting Contact for contactMechId: " + locations.get(0).getString("contactMechId"), module);
+                Debug.logError(e, "Trouble getting Contact for contactMechId: " + locations.get(0).getString("contactMechId"), MODULE);
             }
 
             if (contactMech != null && "POSTAL_ADDRESS".equals(contactMech.getString("contactMechTypeId")))    {
@@ -418,7 +418,7 @@ public final class InvoiceWorker {
                     postalAddress = contactMech.getRelatedOne("PostalAddress", false);
                     return postalAddress;
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, "Trouble getting PostalAddress for contactMechId: " + contactMech.getString("contactMechId"), module);
+                    Debug.logError(e, "Trouble getting PostalAddress for contactMechId: " + contactMech.getString("contactMechId"), MODULE);
                 }
             }
         }
@@ -495,7 +495,7 @@ public final class InvoiceWorker {
             paymentApplications = EntityQuery.use(delegator).from("PaymentAndApplication")
                     .where(conditions).orderBy("effectiveDate").queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting paymentApplicationlist", module);
+            Debug.logError(e, "Trouble getting paymentApplicationlist", MODULE);
         }
         if (paymentApplications != null) {
             for (GenericValue paymentApplication : paymentApplications) {
@@ -544,7 +544,7 @@ public final class InvoiceWorker {
         try {
             invoiceItem = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId,"invoiceItemSeqId", invoiceItemSeqId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting InvoiceItem", module);
+            Debug.logError(e, "Problem getting InvoiceItem", MODULE);
         }
 
         if (invoiceItem == null) {
@@ -565,7 +565,7 @@ public final class InvoiceWorker {
         try {
             paymentApplications = invoiceItem.getRelated("PaymentApplication", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting paymentApplicationlist", module);
+            Debug.logError(e, "Trouble getting paymentApplicationlist", MODULE);
         }
         if (paymentApplications != null) {
             for (GenericValue paymentApplication : paymentApplications) {
@@ -590,7 +590,7 @@ public final class InvoiceWorker {
                 otherCurrencyUomId = EntityUtilProperties.getPropertyValue("general", "currency.uom.id.default", "USD", delegator);
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting database records....", module);
+            Debug.logError(e, "Trouble getting database records....", MODULE);
         }
         if (invoice.getString("currencyUomId").equals(otherCurrencyUomId)) {
             return BigDecimal.ONE;  // organization party has the same currency so conversion not required.
@@ -626,13 +626,13 @@ public final class InvoiceWorker {
                 if (rate != null) {
                     conversionRate = BigDecimal.ONE.divide(rate.getBigDecimal("conversionFactor"), new MathContext(100)).setScale(decimals,rounding);
                 } else {
-                    Debug.logError("Could not find conversionrate for invoice: " + invoice.getString("invoiceId"), module);
+                    Debug.logError("Could not find conversionrate for invoice: " + invoice.getString("invoiceId"), MODULE);
                     return new BigDecimal("1");
                 }
             }
 
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting database records....", module);
+            Debug.logError(e, "Trouble getting database records....", MODULE);
         }
         return(conversionRate);
     }
@@ -646,7 +646,7 @@ public final class InvoiceWorker {
         try {
             invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Invoice", module);
+            Debug.logError(e, "Problem getting Invoice", MODULE);
         }
 
         if (invoice == null) {
@@ -670,7 +670,7 @@ public final class InvoiceWorker {
             try {
                 invoiceItems = invoice.getRelated("InvoiceItem", null, null, false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting InvoiceItem list", module);
+                Debug.logError(e, "Trouble getting InvoiceItem list", MODULE);
             }
             if ("SALES_INVOICE".equals(invoice.getString("invoiceTypeId"))) {
                 invoiceItems = EntityUtil.filterByOr(
@@ -738,7 +738,7 @@ public final class InvoiceWorker {
                             EntityCondition.makeCondition("invoiceItemTypeId", EntityOperator.IN, getTaxableInvoiceItemTypeIds(delegator))
                     ).queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceItem list", module);
+            Debug.logError(e, "Trouble getting InvoiceItem list", MODULE);
             return null;
         }
         if (invoiceTaxItems != null) {
@@ -777,7 +777,7 @@ public final class InvoiceWorker {
                             EntityCondition.makeCondition("taxAuthGeoId", taxAuthGeoId)
                     ).queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting InvoiceItem list", module);
+            Debug.logError(e, "Trouble getting InvoiceItem list", MODULE);
             return null;
         }
        return getTaxTotalForInvoiceItems(invoiceTaxItems);
@@ -797,7 +797,7 @@ public final class InvoiceWorker {
                              EntityCondition.makeCondition("taxAuthPartyId", null)
                      ).queryList();
          } catch (GenericEntityException e) {
-             Debug.logError(e, "Trouble getting InvoiceItem list", module);
+             Debug.logError(e, "Trouble getting InvoiceItem list", MODULE);
              return null;
          }
         return getTaxTotalForInvoiceItems(invoiceTaxItems);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
index fdd41de..35f29b7 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/ledger/GeneralLedgerServices.java
@@ -33,7 +33,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class GeneralLedgerServices {
 
-    public static final String module = GeneralLedgerServices.class.getName();
+    public static final String MODULE = GeneralLedgerServices.class.getName();
 
     public static Map<String, Object> createUpdateCostCenter(DispatchContext dctx, Map<String, ? extends Object> context) {
         LocalDispatcher dispatcher = dctx.getDispatcher();
@@ -60,7 +60,7 @@ public class GeneralLedgerServices {
                     return ServiceUtil.returnError(ServiceUtil.getErrorMessage(result ));
                 }
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
index f8300aa..44d7f26 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/BillingAccountWorker.java
@@ -52,7 +52,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class BillingAccountWorker {
 
-    public static final String module = BillingAccountWorker.class.getName();
+    public static final String MODULE = BillingAccountWorker.class.getName();
     public static final String resourceError = "AccountingUiLabels";
     public static final int decimals = UtilNumber.getBigDecimalScale("order.decimals");
     public static final RoundingMode rounding = UtilNumber.getRoundingMode("order.rounding");
@@ -126,7 +126,7 @@ public class BillingAccountWorker {
             BigDecimal availableBalance = accountLimit.subtract(OrderReadHelper.getBillingAccountBalance(billingAccount)).setScale(decimals, rounding);
             return availableBalance;
         }
-        Debug.logWarning("Available balance requested for null billing account, returning zero", module);
+        Debug.logWarning("Available balance requested for null billing account, returning zero", MODULE);
         return ZERO;
     }
 
@@ -200,7 +200,7 @@ public class BillingAccountWorker {
 
             return result;
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingBillingAccountNotFound",
                     UtilMisc.toMap("billingAccountId", billingAccountId), locale));
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
index 097ff0c..6b7507a 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/GiftCertificateServices.java
@@ -49,7 +49,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class GiftCertificateServices {
 
-    public static final String module = GiftCertificateServices.class.getName();
+    public static final String MODULE = GiftCertificateServices.class.getName();
     public static final String resourceError = "AccountingErrorUiLabels";
     public static final String resourceOrderError = "OrderErrorUiLabels";
     // These are default settings, in case ProductStoreFinActSetting does not have them
@@ -143,11 +143,11 @@ public class GiftCertificateServices {
                     partyId, currencyUom, deposit, finAccountId, locale, orderId);
 
         } catch (GenericEntityException | GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCreationError", locale));
         } catch (GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -158,7 +158,7 @@ public class GiftCertificateServices {
         result.put("processResult", Boolean.TRUE);
         result.put("responseCode", "1");
         result.put("referenceNum", refNum);
-        Debug.logInfo("Create GC Result - " + result, module);
+        Debug.logInfo("Create GC Result - " + result, MODULE);
         return result;
     }
 
@@ -238,7 +238,7 @@ public class GiftCertificateServices {
             finAccount.refresh();
             balance = finAccount.getBigDecimal("availableBalance");
         } catch (GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -249,7 +249,7 @@ public class GiftCertificateServices {
         result.put("processResult", Boolean.TRUE);
         result.put("responseCode", "1");
         result.put("referenceNum", refNum);
-        Debug.logInfo("Add Funds GC Result - " + result, module);
+        Debug.logInfo("Add Funds GC Result - " + result, MODULE);
         return result;
     }
 
@@ -295,7 +295,7 @@ public class GiftCertificateServices {
                     UtilMisc.toMap("productStoreId", productStoreId, 
                             "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId), locale));
         }
-        Debug.logInfo("Attempting to redeem GC for " + amount, module);
+        Debug.logInfo("Attempting to redeem GC for " + amount, MODULE);
 
         GenericValue finAccount = null;
         try {
@@ -319,7 +319,7 @@ public class GiftCertificateServices {
                 balance = finAccount.get("availableBalance") == null ? BigDecimal.ZERO : finAccount.getBigDecimal("availableBalance");
                 procResult = Boolean.TRUE;
             } catch (GeneralException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         } else {
@@ -335,7 +335,7 @@ public class GiftCertificateServices {
         result.put("processResult", procResult);
         result.put("responseCode", "2");
         result.put("referenceNum", refNum);
-        Debug.logInfo("Redeem GC Result - " + result, module);
+        Debug.logInfo("Redeem GC Result - " + result, MODULE);
         return result;
     }
 
@@ -365,7 +365,7 @@ public class GiftCertificateServices {
 
         Map<String, Object> result = ServiceUtil.returnSuccess();
         result.put("balance", balance);
-        Debug.logInfo("GC Balance Result - " + result, module);
+        Debug.logInfo("GC Balance Result - " + result, MODULE);
         return result;
     }
 
@@ -550,7 +550,7 @@ public class GiftCertificateServices {
                     processResult = Boolean.TRUE;
                 }
             } else {
-                Debug.logError("Attempted to authorize [" + amount + "] against a balance of only [" + availableBalance + "]", module);
+                Debug.logError("Attempted to authorize [" + amount + "] against a balance of only [" + availableBalance + "]", MODULE);
                 refNum = "N/A";      // a refNum is always required from authorization
                 processResult = Boolean.FALSE;
             }
@@ -565,7 +565,7 @@ public class GiftCertificateServices {
 
             return result;
         } catch (GenericEntityException | GenericServiceException ex) {
-            Debug.logError(ex, "Cannot authorize gift certificate", module);
+            Debug.logError(ex, "Cannot authorize gift certificate", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotAuthorize",
                     UtilMisc.toMap("errorString", ex.getMessage()), locale));
@@ -610,7 +610,7 @@ public class GiftCertificateServices {
 
             return result;
         } catch (GenericServiceException e) {
-            Debug.logError(e, e.getMessage(), module);
+            Debug.logError(e, e.getMessage(), MODULE);
             return ServiceUtil.returnError(err + e.getMessage());
         }
     }
@@ -637,7 +637,7 @@ public class GiftCertificateServices {
         try {
             giftCard = paymentPref.getRelatedOne("GiftCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get GiftCard from OrderPaymentPreference", module);
+            Debug.logError(e, "Unable to get GiftCard from OrderPaymentPreference", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
         }
@@ -665,7 +665,7 @@ public class GiftCertificateServices {
         try {
             restoreGcResult = dispatcher.runSync("addFundsToGiftCertificate", refundCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberRefundCallError", locale));
         }
@@ -702,7 +702,7 @@ public class GiftCertificateServices {
         try {
             orderHeader = orderItem.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get OrderHeader from OrderItem",module);
+            Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                     "OrderCannotGetOrderHeader", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -745,7 +745,7 @@ public class GiftCertificateServices {
         try {
             product = orderItem.getRelatedOne("Product", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get Product from OrderItem", module);
+            Debug.logError(e, "Unable to get Product from OrderItem", MODULE);
         }
         if (product == null) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
@@ -759,7 +759,7 @@ public class GiftCertificateServices {
                     .where("productStoreId", productStoreId, "finAccountTypeId", FinAccountHelper.giftCertFinAccountTypeId)
                     .cache().queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get Product Store FinAccount settings for " + FinAccountHelper.giftCertFinAccountTypeId, module);
+            Debug.logError(e, "Unable to get Product Store FinAccount settings for " + FinAccountHelper.giftCertFinAccountTypeId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingFinAccountSetting", 
                     UtilMisc.toMap("productStoreId", productStoreId, 
@@ -777,7 +777,7 @@ public class GiftCertificateServices {
                     .where("orderId", orderId, "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId)
                     .orderBy("-responseDate").queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
         }
@@ -791,7 +791,7 @@ public class GiftCertificateServices {
         try {
             responseAnswers = surveyResponse.getRelated("SurveyResponseAnswer", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
         }
@@ -804,7 +804,7 @@ public class GiftCertificateServices {
                 try {
                     question = answer.getRelatedOne("SurveyQuestion", false);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                             "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
                 }
@@ -842,7 +842,7 @@ public class GiftCertificateServices {
             try {
                 createGcResult = dispatcher.runSync("createGiftCertificate", createGcCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                         "AccountingGiftCertificateNumberCreationError", locale) + e.getMessage());
             }
@@ -868,7 +868,7 @@ public class GiftCertificateServices {
             try {
                 dispatcher.runAsync("createGcFulFillmentRecord", gcFulFill, true);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                         "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
                         UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -885,10 +885,10 @@ public class GiftCertificateServices {
             try {
                 productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Unable to get product store email setting for gift card purchase", module);
+                Debug.logError(e, "Unable to get product store email setting for gift card purchase", MODULE);
             }
             if (productStoreEmail == null) {
-                Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module);
+                Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", MODULE);
             } else {
                 answerMap.put("locale", locale);
 
@@ -918,7 +918,7 @@ public class GiftCertificateServices {
                 try {
                     dispatcher.runAsync("sendMailFromScreen", emailCtx);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Problem sending mail", module);
+                    Debug.logError(e, "Problem sending mail", MODULE);
                     // this is fatal; we will rollback and try again later
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                             "AccountingGiftCertificateNumberCannotSendEmailNotice",
@@ -945,7 +945,7 @@ public class GiftCertificateServices {
         try {
             orderHeader = orderItem.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get OrderHeader from OrderItem",module);
+            Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                     "OrderCannotGetOrderHeader", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -1003,7 +1003,7 @@ public class GiftCertificateServices {
                     .where("orderId", orderId, "orderItemSeqId", orderItem.get("orderItemSeqId"), "surveyId", surveyId)
                     .orderBy("-responseDate").queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                     "AccountingGiftCertificateNumberCannotReload", locale));
         }
@@ -1013,7 +1013,7 @@ public class GiftCertificateServices {
         try {
             responseAnswers = surveyResponse.getRelated("SurveyResponseAnswer", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                     "AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers", locale));
         }
@@ -1026,7 +1026,7 @@ public class GiftCertificateServices {
                 try {
                     question = answer.getRelatedOne("SurveyQuestion", false);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                             "AccountingGiftCertificateNumberCannotReloadFromSurveyAnswers", locale));
                 }
@@ -1058,7 +1058,7 @@ public class GiftCertificateServices {
         try {
             reloadGcResult = dispatcher.runSync("addFundsToGiftCertificate", reloadCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             errorMessage = "Unable to call reload service!";
         }
         if (ServiceUtil.isError(reloadGcResult)) {
@@ -1083,7 +1083,7 @@ public class GiftCertificateServices {
         try {
             dispatcher.runAsync("createGcFulFillmentRecord", gcFulFill, true);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -1091,7 +1091,7 @@ public class GiftCertificateServices {
 
         if (errorMessage != null) {
             // there was a problem
-            Debug.logError("Reload Failed Need to Refund : " + reloadGcResult, module);
+            Debug.logError("Reload Failed Need to Refund : " + reloadGcResult, MODULE);
 
             // process the return
             try {
@@ -1099,7 +1099,7 @@ public class GiftCertificateServices {
                         "partyId", partyId, "userLogin", userLogin);
                 dispatcher.runAsync("refundGcPurchase", refundCtx, null, true, 300, true);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "ERROR! Unable to call create refund service; this failed reload will NOT be refunded", module);
+                Debug.logError(e, "ERROR! Unable to call create refund service; this failed reload will NOT be refunded", MODULE);
             }
 
             return ServiceUtil.returnError(errorMessage);
@@ -1117,10 +1117,10 @@ public class GiftCertificateServices {
         try {
             productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get product store email setting for gift card purchase", module);
+            Debug.logError(e, "Unable to get product store email setting for gift card purchase", MODULE);
         }
         if (productStoreEmail == null) {
-            Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module);
+            Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", MODULE);
         } else {
             answerMap.put("locale", locale);
 
@@ -1143,7 +1143,7 @@ public class GiftCertificateServices {
             try {
                 dispatcher.runAsync("sendMailFromScreen", emailCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problem sending mail", module);
+                Debug.logError(e, "Problem sending mail", MODULE);
                 // this is fatal; we will rollback and try again later
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                         "AccountingGiftCertificateNumberCannotSendEmailNotice",
@@ -1178,7 +1178,7 @@ public class GiftCertificateServices {
         try {
             delegator.create(gcFulFill);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
                     UtilMisc.toMap("errorString", e.toString()), locale));
@@ -1199,7 +1199,7 @@ public class GiftCertificateServices {
         try {
             orderItem.refresh();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         Map<String, Object> returnableInfo = null;
@@ -1210,7 +1210,7 @@ public class GiftCertificateServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(returnableInfo));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                     "OrderErrorUnableToGetReturnItemInformation", locale));
         }
@@ -1218,7 +1218,7 @@ public class GiftCertificateServices {
         if (returnableInfo != null) {
             BigDecimal returnableQuantity = (BigDecimal) returnableInfo.get("returnableQuantity");
             BigDecimal returnablePrice = (BigDecimal) returnableInfo.get("returnablePrice");
-            Debug.logInfo("Returnable INFO : " + returnableQuantity + " @ " + returnablePrice + " :: " + orderItem, module);
+            Debug.logInfo("Returnable INFO : " + returnableQuantity + " @ " + returnablePrice + " :: " + orderItem, MODULE);
 
             // create the return header
             Map<String, Object> returnHeaderInfo = new HashMap<>();
@@ -1228,7 +1228,7 @@ public class GiftCertificateServices {
             try {
                 returnHeaderResp = dispatcher.runSync("createReturnHeader", returnHeaderInfo);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                         "OrderErrorUnableToCreateReturnHeader", locale));
             }
@@ -1260,7 +1260,7 @@ public class GiftCertificateServices {
             try {
                 returnItemResp = dispatcher.runSync("createReturnItem", returnItemInfo);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                         "OrderErrorUnableToCreateReturnItem", locale));
             }
@@ -1276,7 +1276,7 @@ public class GiftCertificateServices {
                         "OrderErrorCreateReturnItemWithoutId", locale));
             }
             if (Debug.verboseOn()) {
-                Debug.logVerbose("Created return item : " + returnId + " / " + returnItemSeqId, module);
+                Debug.logVerbose("Created return item : " + returnId + " / " + returnItemSeqId, MODULE);
             }
 
             // need the system userLogin to "fake" out the update service
@@ -1284,7 +1284,7 @@ public class GiftCertificateServices {
             try {
                 admin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                         "OrderErrorUnableToUpdateReturnHeaderStatusWithoutUserLogin", locale));
             }
@@ -1299,7 +1299,7 @@ public class GiftCertificateServices {
             try {
                 updateReturnResp = dispatcher.runSync("updateReturnHeader", updateReturnInfo);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrderError, 
                         "OrderErrorUnableToUpdateReturnHeaderStatus", locale));
             }
@@ -1318,19 +1318,19 @@ public class GiftCertificateServices {
         try {
             finAccount = EntityQuery.use(delegator).from("FinAccount").where("finAccountId", cardNumber).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (finAccount != null) {
             String dbPin = finAccount.getString("finAccountCode");
             if (Debug.infoOn()) {
-                Debug.logInfo("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", module);
+                Debug.logInfo("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", MODULE);
             }
             if (dbPin != null && dbPin.equals(pinNumber)) {
                 return true;
             }
         } 
         if (Debug.infoOn()) {
-            Debug.logInfo("GC FinAccount record not found (" + cardNumber + ")", module);
+            Debug.logInfo("GC FinAccount record not found (" + cardNumber + ")", MODULE);
         }
         return false;
     }
@@ -1467,7 +1467,7 @@ public class GiftCertificateServices {
         try {
             productStore = EntityQuery.use(delegator).from("ProductStore").where("productStoreId", productStoreId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to locate ProductStore (" + productStoreId + ")", module);
+            Debug.logError(e, "Unable to locate ProductStore (" + productStoreId + ")", MODULE);
             return null;
         }
         if (productStore != null && productStore.get("payToPartyId") != null) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
index 7eb708a..5a92b04 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
@@ -75,7 +75,7 @@ import com.ibm.icu.util.Calendar;
  */
 public class PaymentGatewayServices {
 
-    public static final String module = PaymentGatewayServices.class.getName();
+    public static final String MODULE = PaymentGatewayServices.class.getName();
     public static final String AUTH_SERVICE_TYPE = "PRDS_PAY_AUTH";
     private static final String REAUTH_SERVICE_TYPE = "PRDS_PAY_REAUTH";
     private static final String RELEASE_SERVICE_TYPE = "PRDS_PAY_RELEASE";
@@ -126,7 +126,7 @@ public class PaymentGatewayServices {
             orderPaymentPreference = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne();
             orderHeader = orderPaymentPreference.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);
@@ -148,7 +148,7 @@ public class PaymentGatewayServices {
             orderPaymentPreference.store();
             orderPaymentPreference.refresh();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale));
         }
@@ -252,7 +252,7 @@ public class PaymentGatewayServices {
                                                 }
                                             } catch (GeneralException e) {
                                                 String errMsg = "Error saving and processing payment authorization results: " + e.toString();
-                                                Debug.logError(e, errMsg + "; authRetryResult: " + authRetryResult, module);
+                                                Debug.logError(e, errMsg + "; authRetryResult: " + authRetryResult, MODULE);
                                                 Map<String, Object> results = ServiceUtil.returnSuccess();
                                                 results.put(ModelService.ERROR_MESSAGE, errMsg);
                                                 results.put("finished", Boolean.FALSE);
@@ -275,7 +275,7 @@ public class PaymentGatewayServices {
                     }
                 } catch (GeneralException e) {
                     String errMsg = "Error saving and processing payment authorization results: " + e.toString();
-                    Debug.logError(e, errMsg + "; authPaymentResult: " + authPaymentResult, module);
+                    Debug.logError(e, errMsg + "; authPaymentResult: " + authPaymentResult, MODULE);
                     Map<String, Object> results = ServiceUtil.returnSuccess();
                     results.put(ModelService.ERROR_MESSAGE, errMsg);
                     results.put("finished", Boolean.FALSE);
@@ -285,7 +285,7 @@ public class PaymentGatewayServices {
             } else {
                 // error with payment processor; will try later
                 String errMsg = "Invalid Order Payment Preference: maxAmount is 0";
-                Debug.logInfo(errMsg, module);
+                Debug.logInfo(errMsg, MODULE);
                 Map<String, Object> results = ServiceUtil.returnSuccess();
                 results.put("finished", Boolean.FALSE);
                 results.put("errors", Boolean.TRUE);
@@ -294,12 +294,12 @@ public class PaymentGatewayServices {
                 try {
                     orderPaymentPreference.store();
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, "ERROR: Problem setting OrderPaymentPreference status to CANCELLED", module);
+                    Debug.logError(e, "ERROR: Problem setting OrderPaymentPreference status to CANCELLED", MODULE);
                 }
                 return results;
             }
         } catch (GeneralException e) {
-            Debug.logError(e, "Error processing payment authorization", module);
+            Debug.logError(e, "Error processing payment authorization", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingPaymentCannotBeAuthorized", 
                     UtilMisc.toMap("errroString", e.toString()), locale));
@@ -338,7 +338,7 @@ public class PaymentGatewayServices {
                 paymentPrefs.addAll(EntityQuery.use(delegator).from("OrderPaymentPreference").where(lookupMap).orderBy(orderList).queryList());
             }
         } catch (GenericEntityException gee) {
-            Debug.logError(gee, "Problems getting the order information", module);
+            Debug.logError(gee, "Problems getting the order information", MODULE);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
             result.put(ModelService.ERROR_MESSAGE, "ERROR: Could not get order information (" + gee.toString() + ").");
             return result;
@@ -386,7 +386,7 @@ public class PaymentGatewayServices {
                     return ServiceUtil.returnError(ServiceUtil.getErrorMessage(results));
                 }
             } catch (GenericServiceException se) {
-                Debug.logError(se, "Error in calling authOrderPaymentPreference from authOrderPayments", module);
+                Debug.logError(se, "Error in calling authOrderPaymentPreference from authOrderPayments", MODULE);
                 hadError += 1;
                 messages.add("Could not authorize OrderPaymentPreference [" + paymentPref.getString("orderPaymentPreferenceId") + "] for order [" + orderId + "]: " + se.toString());
                 continue;
@@ -415,23 +415,23 @@ public class PaymentGatewayServices {
             }
         }
 
-        Debug.logInfo("Finished with auth(s) checking results", module);
+        Debug.logInfo("Finished with auth(s) checking results", MODULE);
 
         // add messages to the result
         result.put("authResultMsgs", messages);
 
         if (hadError > 0) {
-            Debug.logError("Error(s) (" + hadError + ") during auth; returning ERROR", module);
+            Debug.logError("Error(s) (" + hadError + ") during auth; returning ERROR", MODULE);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             result.put("processResult", "ERROR");
             return result;
         } else if (finished == paymentPrefs.size()) {
-            Debug.logInfo("All auth(s) passed total remaining : " + totalRemaining, module);
+            Debug.logInfo("All auth(s) passed total remaining : " + totalRemaining, MODULE);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             result.put("processResult", "APPROVED");
             return result;
         } else {
-            Debug.logInfo("Only [" + finished + "/" + paymentPrefs.size() + "] OrderPaymentPreference authorizations passed; returning processResult=FAILED with no message so that message from ProductStore will be used", module);
+            Debug.logInfo("Only [" + finished + "/" + paymentPrefs.size() + "] OrderPaymentPreference authorizations passed; returning processResult=FAILED with no message so that message from ProductStore will be used", MODULE);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             result.put("processResult", "FAILED");
             return result;
@@ -481,7 +481,7 @@ public class PaymentGatewayServices {
             try {
                 visit = orderHeader.getDelegator().findOne("Visit", UtilMisc.toMap("visitId", visitId), false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
 
@@ -528,7 +528,7 @@ public class PaymentGatewayServices {
         processAmount = processAmount.setScale(decimals, rounding);
 
         if (Debug.verboseOn()) {
-            Debug.logVerbose("Charging amount: " + processAmount, module);
+            Debug.logVerbose("Charging amount: " + processAmount, MODULE);
         }
         processContext.put("processAmount", processAmount);
 
@@ -596,14 +596,14 @@ public class PaymentGatewayServices {
                 }
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Error occurred on: " + serviceName + ", Order ID is: [" + orh.getOrderId() + "]", module);
+            Debug.logError(e, "Error occurred on: " + serviceName + ", Order ID is: [" + orh.getOrderId() + "]", MODULE);
             throw new GeneralException("Problems invoking payment processor! Will retry later. Order ID is: [" + orh.getOrderId() + "]", e);
         }
 
         if (processorResult != null) {
             // check for errors from the processor implementation
             if (ServiceUtil.isError(processorResult)) {
-                Debug.logError("Processor failed; will retry later: " + processorResult.get(ModelService.ERROR_MESSAGE), module);
+                Debug.logError("Processor failed; will retry later: " + processorResult.get(ModelService.ERROR_MESSAGE), MODULE);
                 // log the error message as a gateway response when it fails
                 saveError(dispatcher, userLogin, paymentPreference, processorResult, AUTH_SERVICE_TYPE, "PGT_AUTHORIZE");
                 // this is the one place where we want to return null because the calling method will look for this
@@ -644,13 +644,13 @@ public class PaymentGatewayServices {
         try {
             productStore = orderHeader.getRelatedOne("ProductStore", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get ProductStore from OrderHeader", module);
+            Debug.logError(e, "Unable to get ProductStore from OrderHeader", MODULE);
             return null;
         }
         if (productStore != null && productStore.get("payToPartyId") != null) {
             payToPartyId = productStore.getString("payToPartyId");
         } else {
-            Debug.logWarning("Using default value of [Company] for payToPartyId on order [" + orderHeader.getString("orderId") + "]", module);
+            Debug.logWarning("Using default value of [Company] for payToPartyId on order [" + orderHeader.getString("orderId") + "]", MODULE);
         }
         return payToPartyId;
     }
@@ -687,7 +687,7 @@ public class PaymentGatewayServices {
         } else {
             // add other payment types here; i.e. gift cards, etc.
             // unknown payment type; ignoring.
-            Debug.logError("ERROR: Unsupported PaymentMethodType passed for authorization", module);
+            Debug.logError("ERROR: Unsupported PaymentMethodType passed for authorization", MODULE);
             return null;
         }
 
@@ -752,7 +752,7 @@ public class PaymentGatewayServices {
             EntityCondition con4 = EntityCondition.makeCondition(UtilMisc.toList(con3, orderExpr), EntityOperator.AND);
             paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference").where(con4).queryList();
         } catch (GenericEntityException gee) {
-            Debug.logError(gee, "Problems getting entity record(s), see stack trace", module);
+            Debug.logError(gee, "Problems getting entity record(s), see stack trace", MODULE);
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_ERROR);
             result.put(ModelService.ERROR_MESSAGE, "ERROR: Could not get order information (" + gee.toString() + ").");
             return result;
@@ -760,7 +760,7 @@ public class PaymentGatewayServices {
 
         // return complete if no payment prefs were found
         if (paymentPrefs.size() == 0) {
-            Debug.logWarning("No OrderPaymentPreference records available for release", module);
+            Debug.logWarning("No OrderPaymentPreference records available for release", MODULE);
             result.put("processResult", "COMPLETE");
             result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
             return result;
@@ -775,13 +775,13 @@ public class PaymentGatewayServices {
                 releaseResult = dispatcher.runSync("releaseOrderPaymentPreference", releaseContext);
             } catch (GenericServiceException e) {
                 Debug.logError(e, "Problem calling releaseOrderPaymentPreference service for orderPaymentPreferenceId" + 
-                        paymentPref.getString("orderPaymentPreferenceId"), module);
+                        paymentPref.getString("orderPaymentPreferenceId"), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                         "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " +
                         paymentPref.getString("orderPaymentPreferenceId"));
             }
             if (ServiceUtil.isError(releaseResult)) {
-                Debug.logError(ServiceUtil.getErrorMessage(releaseResult), module);
+                Debug.logError(ServiceUtil.getErrorMessage(releaseResult), MODULE);
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(releaseResult));
             } else if (! ServiceUtil.isFailure(releaseResult)) {
                 finished.add(paymentPref);
@@ -845,14 +845,14 @@ public class PaymentGatewayServices {
             try {
                 paymentPref.store();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Problem storing updated payment preference; authorization was credit!", module);
+                Debug.logError(e, "Problem storing updated payment preference; authorization was credit!", MODULE);
             }
             // cancel any payment records
             List<GenericValue> paymentList = null;
             try {
                 paymentList = paymentPref.getRelated("Payment", null, null, false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Unable to get Payment records from OrderPaymentPreference : " + paymentPref, module);
+                Debug.logError(e, "Unable to get Payment records from OrderPaymentPreference : " + paymentPref, MODULE);
             }
             if (paymentList != null) {
                 Iterator<GenericValue> pi = paymentList.iterator();
@@ -864,12 +864,12 @@ public class PaymentGatewayServices {
                             throw new GenericServiceException(ServiceUtil.getErrorMessage(cancelResults));
                         }
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, "Unable to cancel Payment : " + pay, module);
+                        Debug.logError(e, "Unable to cancel Payment : " + pay, MODULE);
                     }
                 }
             }
         } else {
-            Debug.logError("Credit failed for pref : " + paymentPref, module);
+            Debug.logError("Credit failed for pref : " + paymentPref, MODULE);
             return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, 
                     "AccountingTroubleCallingCreditOrderPaymentPreferenceService", 
                     UtilMisc.toMap("paymentPref", paymentPref), locale));
@@ -895,7 +895,7 @@ public class PaymentGatewayServices {
             paymentPref = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne();
         } catch (GenericEntityException e) {
             Debug.logWarning(e, "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + 
-                    orderPaymentPreferenceId, module);
+                    orderPaymentPreferenceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);
@@ -903,7 +903,7 @@ public class PaymentGatewayServices {
         // Error if no OrderPaymentPreference was found
         if (paymentPref == null) {
             Debug.logWarning("Could not find OrderPaymentPreference with orderPaymentPreferenceId: " + 
-                    orderPaymentPreferenceId, module);
+                    orderPaymentPreferenceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);
@@ -914,14 +914,14 @@ public class PaymentGatewayServices {
         try {
             orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, module);
+            Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
         // Error if no OrderHeader was found
         if (orderHeader == null) {
             Debug.logWarning("Could not find OrderHeader with orderId: " + 
-                    orderId + "; not processing payments.", module);
+                    orderId + "; not processing payments.", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -944,13 +944,13 @@ public class PaymentGatewayServices {
             paymentConfig = paymentSettings.getString("paymentPropertiesPath");
             paymentGatewayConfigId = paymentSettings.getString("paymentGatewayConfigId");
             if (serviceName == null) {
-                Debug.logWarning("No payment release service for - " + paymentPref.getString("paymentMethodTypeId"), module);
+                Debug.logWarning("No payment release service for - " + paymentPref.getString("paymentMethodTypeId"), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                         "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " + 
                         paymentPref.getString("paymentMethodTypeId"));
             }
         } else {
-            Debug.logWarning("No payment release settings found for - " + paymentPref.getString("paymentMethodTypeId"), module);
+            Debug.logWarning("No payment release settings found for - " + paymentPref.getString("paymentMethodTypeId"), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " + 
                     paymentPref.getString("paymentMethodTypeId"));
@@ -971,7 +971,7 @@ public class PaymentGatewayServices {
         try {
             releaseResult = dispatcher.runSync(serviceName, releaseContext, TX_TIME, true);
         } catch (GenericServiceException e) {
-            Debug.logError(e,"Problem releasing payment", module);
+            Debug.logError(e,"Problem releasing payment", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale));
         }
@@ -985,7 +985,7 @@ public class PaymentGatewayServices {
                 Map<String, Object> resCtx = model.makeValid(releaseResult, ModelService.IN_PARAM);
                 releaseResRes = dispatcher.runSync(model.name,  resCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Trouble processing the release results", module);
+                Debug.logError(e, "Trouble processing the release results", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                         "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " +
                         e.getMessage());
@@ -1049,14 +1049,14 @@ public class PaymentGatewayServices {
             try {
                 paymentPref.store();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Problem storing updated payment preference; authorization was released!", module);
+                Debug.logError(e, "Problem storing updated payment preference; authorization was released!", MODULE);
             }
             // cancel any payment records
             List<GenericValue> paymentList = null;
             try {
                 paymentList = paymentPref.getRelated("Payment", null, null, false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Unable to get Payment records from OrderPaymentPreference : " + paymentPref, module);
+                Debug.logError(e, "Unable to get Payment records from OrderPaymentPreference : " + paymentPref, MODULE);
             }
             if (paymentList != null) {
                 Iterator<GenericValue> pi = paymentList.iterator();
@@ -1068,12 +1068,12 @@ public class PaymentGatewayServices {
                             throw new GenericServiceException(ServiceUtil.getErrorMessage(cancelResults));
                         }
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, "Unable to cancel Payment : " + pay, module);
+                        Debug.logError(e, "Unable to cancel Payment : " + pay, MODULE);
                     }
                 }
             }
         } else {
-            Debug.logError("Release failed for pref : " + paymentPref, module);
+            Debug.logError("Release failed for pref : " + paymentPref, MODULE);
             return ServiceUtil.returnFailure(UtilProperties.getMessage(resourceOrder, 
                     "AccountingTroubleCallingReleaseOrderPaymentPreferenceService", locale) + " " +
                     paymentPref);
@@ -1097,13 +1097,13 @@ public class PaymentGatewayServices {
         try {
             invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble looking up Invoice #" + invoiceId, module);
+            Debug.logError(e, "Trouble looking up Invoice #" + invoiceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingInvoiceNotFound", UtilMisc.toMap("invoiceId", invoiceId), locale));
         }
 
         if (invoice == null) {
-            Debug.logError("Could not locate invoice #" + invoiceId, module);
+            Debug.logError("Could not locate invoice #" + invoiceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingInvoiceNotFound", UtilMisc.toMap("invoiceId", invoiceId), locale));
         }
@@ -1113,7 +1113,7 @@ public class PaymentGatewayServices {
         try {
             orderItemBillings = invoice.getRelated("OrderItemBilling", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError("Trouble getting OrderItemBilling(s) from Invoice #" + invoiceId, module);
+            Debug.logError("Trouble getting OrderItemBilling(s) from Invoice #" + invoiceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemLookingUpOrderItemBilling", 
                     UtilMisc.toMap("billFields", invoiceId), locale));
@@ -1142,7 +1142,7 @@ public class PaymentGatewayServices {
         }
 
         if (testOrderId == null || !allSameOrder) {
-            Debug.logWarning("Attempt to settle Invoice #" + invoiceId + " which contained none/multiple orders", module);
+            Debug.logWarning("Attempt to settle Invoice #" + invoiceId + " which contained none/multiple orders", MODULE);
             return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, 
                     "AccountingInvoiceCannotBeSettle", 
                     UtilMisc.toMap("invoiceId", invoiceId), locale));
@@ -1151,7 +1151,7 @@ public class PaymentGatewayServices {
         // get the invoice amount (amount to bill)
         BigDecimal invoiceTotal = InvoiceWorker.getInvoiceNotApplied(invoice);
         if (Debug.infoOn()) {
-            Debug.logInfo("(Capture) Invoice [#" + invoiceId + "] total: " + invoiceTotal, module);
+            Debug.logInfo("(Capture) Invoice [#" + invoiceId + "] total: " + invoiceTotal, MODULE);
         }
 
         // now capture the order
@@ -1166,7 +1166,7 @@ public class PaymentGatewayServices {
             }
             return result;
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Trouble running captureOrderPayments service", module);
+            Debug.logError(e, "Trouble running captureOrderPayments service", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentCannotBeCaptured", locale));
         }
@@ -1205,7 +1205,7 @@ public class PaymentGatewayServices {
                         .orderBy("-maxAmount").queryList();
             }
         } catch (GenericEntityException gee) {
-            Debug.logError(gee, "Problems getting entity record(s), see stack trace", module);
+            Debug.logError(gee, "Problems getting entity record(s), see stack trace", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale) + " " + gee.toString());
         }
@@ -1225,12 +1225,12 @@ public class PaymentGatewayServices {
         totalPayments = totalPayments.setScale(decimals, rounding);
         BigDecimal remainingTotal = orderGrandTotal.subtract(totalPayments);
         if (Debug.infoOn()) {
-            Debug.logInfo("The Remaining Total for order: " + orderId + " is: " + remainingTotal, module);
+            Debug.logInfo("The Remaining Total for order: " + orderId + " is: " + remainingTotal, MODULE);
         }
         // The amount to capture cannot be greater than the remaining total
         amountToCapture = amountToCapture.min(remainingTotal);
         if (Debug.infoOn()) {
-            Debug.logInfo("Actual Expected Capture Amount : " + amountToCapture, module);
+            Debug.logInfo("Actual Expected Capture Amount : " + amountToCapture, MODULE);
         }
         // Process billing accounts payments
         if (UtilValidate.isNotEmpty(paymentPrefsBa)) {
@@ -1246,7 +1246,7 @@ public class PaymentGatewayServices {
 
                 if (authAmount.compareTo(ZERO) == 0) {
                     // nothing to capture
-                    Debug.logInfo("Nothing to capture; authAmount = 0", module);
+                    Debug.logInfo("Nothing to capture; authAmount = 0", MODULE);
                     continue;
                 }
                 // the amount for *this* capture
@@ -1277,12 +1277,12 @@ public class PaymentGatewayServices {
                         try {
                             amountCaptured = (BigDecimal) ObjectType.simpleTypeOrObjectConvert(captureResult.get("captureAmount"), "BigDecimal", null, locale);
                         } catch (GeneralException e) {
-                            Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, module);
+                            Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
                                     "AccountingPaymentCannotBeCaptured", locale) + " " + captureResult);
                         }
                         if (Debug.infoOn()) {
-                            Debug.logInfo("Amount captured for order [" + orderId + "] from unapplied payments associated to billing account [" + billingAccountId + "] is: " + amountCaptured, module);
+                            Debug.logInfo("Amount captured for order [" + orderId + "] from unapplied payments associated to billing account [" + billingAccountId + "] is: " + amountCaptured, MODULE);
                         }
 
                         amountCaptured = amountCaptured.setScale(decimals, rounding);
@@ -1305,7 +1305,7 @@ public class PaymentGatewayServices {
                             // statusId = PAYMENT_RECEIVED
                             processResult(dctx, captureResult, userLogin, paymentPref, locale);
                         } catch (GeneralException e) {
-                            Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, module);
+                            Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, MODULE);
                             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                                     "AccountingPaymentCannotBeCaptured", locale) + " " + captureResult);
                         }
@@ -1317,14 +1317,14 @@ public class PaymentGatewayServices {
                                 Map<String, Object> splitCtx = UtilMisc.<String, Object>toMap("userLogin", userLogin, "orderPaymentPreference", paymentPref, "splitAmount", splitAmount);
                                 dispatcher.addCommitService("processCaptureSplitPayment", splitCtx, true);
                             } catch (GenericServiceException e) {
-                                Debug.logWarning(e, "Problem processing the capture split payment", module);
+                                Debug.logWarning(e, "Problem processing the capture split payment", MODULE);
                             }
                             if (Debug.infoOn()) {
-                                Debug.logInfo("Captured: " + amountThisCapture + " Remaining (re-auth): " + splitAmount, module);
+                                Debug.logInfo("Captured: " + amountThisCapture + " Remaining (re-auth): " + splitAmount, MODULE);
                             }
                         }
                     } else {
-                        Debug.logError("Payment not captured for order [" + orderId + "] from billing account [" + billingAccountId + "]", module);
+                        Debug.logError("Payment not captured for order [" + orderId + "] from billing account [" + billingAccountId + "]", MODULE);
                     }
                 }
             }
@@ -1338,14 +1338,14 @@ public class PaymentGatewayServices {
                 GenericValue paymentPref = payments.next();
                 GenericValue authTrans = getAuthTransaction(paymentPref);
                 if (authTrans == null) {
-                    Debug.logWarning("Authorized OrderPaymentPreference has no corresponding PaymentGatewayResponse, cannot capture payment: " + paymentPref, module);
+                    Debug.logWarning("Authorized OrderPaymentPreference has no corresponding PaymentGatewayResponse, cannot capture payment: " + paymentPref, MODULE);
                     continue;
                 }
 
                 // check for an existing capture
                 GenericValue captureTrans = getCaptureTransaction(paymentPref);
                 if (captureTrans != null) {
-                    Debug.logWarning("Attempt to capture and already captured preference: " + captureTrans, module);
+                    Debug.logWarning("Attempt to capture and already captured preference: " + captureTrans, MODULE);
                     continue;
                 }
 
@@ -1357,7 +1357,7 @@ public class PaymentGatewayServices {
 
                 if (authAmount.compareTo(ZERO) == 0) {
                     // nothing to capture
-                    Debug.logInfo("Nothing to capture; authAmount = 0", module);
+                    Debug.logInfo("Nothing to capture; authAmount = 0", MODULE);
                     continue;
                 }
 
@@ -1379,7 +1379,7 @@ public class PaymentGatewayServices {
                     // TODO: add what the billing account cannot support to the re-auth amount
                     // TODO: add support for re-auth for additional funds
                     // just in case; we will capture the authorized amount here; until this is implemented
-                    Debug.logError("The amount to capture was more then what was authorized; we only captured the authorized amount : " + paymentPref, module);
+                    Debug.logError("The amount to capture was more then what was authorized; we only captured the authorized amount : " + paymentPref, MODULE);
                     amountThisCapture = authAmount;
                 }
 
@@ -1407,7 +1407,7 @@ public class PaymentGatewayServices {
                     // process the capture's results
                         processResult(dctx, captureResult, userLogin, paymentPref, locale);
                     } catch (GeneralException e) {
-                        Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, module);
+                        Debug.logError(e, "Trouble processing the result; captureResult: " + captureResult, MODULE);
                         return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                                 "AccountingPaymentCannotBeCaptured", locale) + " " + captureResult);
                     }
@@ -1419,14 +1419,14 @@ public class PaymentGatewayServices {
                             Map<String, Object> splitCtx = UtilMisc.<String, Object>toMap("userLogin", userLogin, "orderPaymentPreference", paymentPref, "splitAmount", splitAmount);
                             dispatcher.addCommitService("processCaptureSplitPayment", splitCtx, true);
                         } catch (GenericServiceException e) {
-                            Debug.logWarning(e, "Problem processing the capture split payment", module);
+                            Debug.logWarning(e, "Problem processing the capture split payment", MODULE);
                         }
                         if (Debug.infoOn()) {
-                            Debug.logInfo("Captured: " + amountThisCapture + " Remaining (re-auth): " + splitAmount, module);
+                            Debug.logInfo("Captured: " + amountThisCapture + " Remaining (re-auth): " + splitAmount, MODULE);
                         }
                     }
                 } else {
-                    Debug.logError("Payment not captured", module);
+                    Debug.logError("Payment not captured", MODULE);
                 }
             }
         }
@@ -1439,7 +1439,7 @@ public class PaymentGatewayServices {
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                             "AccountingPaymentCannotBeCaptured", locale));
                 } else {
-                    Debug.logWarning("Payment capture failed, shipping order anyway as per ProductStore setting (shipIfCaptureFails)", module);
+                    Debug.logWarning("Payment capture failed, shipping order anyway as per ProductStore setting (shipIfCaptureFails)", MODULE);
                 }
             }
             Map<String, Object> result = ServiceUtil.returnSuccess();
@@ -1470,7 +1470,7 @@ public class PaymentGatewayServices {
             statusId = "PAYMENT_AUTHORIZED";
         }
         // create a new payment preference
-        Debug.logInfo("Creating payment preference split", module);
+        Debug.logInfo("Creating payment preference split", MODULE);
         String newPrefId = delegator.getNextSeqId("OrderPaymentPreference");
         GenericValue newPref = delegator.makeValue("OrderPaymentPreference", UtilMisc.toMap("orderPaymentPreferenceId", newPrefId));
         newPref.set("orderId", paymentPref.get("orderId"));
@@ -1483,7 +1483,7 @@ public class PaymentGatewayServices {
             newPref.set("createdByUserLogin", userLogin.getString("userLoginId"));
         }
         if (Debug.verboseOn()) {
-            Debug.logVerbose("New preference : " + newPref, module);
+            Debug.logVerbose("New preference : " + newPref, MODULE);
         }
 
         Map<String, Object> processorResult = null;
@@ -1508,19 +1508,19 @@ public class PaymentGatewayServices {
                     // process the auth results
                     boolean authResult = processResult(dctx, processorResult, userLogin, newPref, locale);
                     if (!authResult) {
-                        Debug.logError("Authorization failed : " + newPref + " : " + processorResult, module);
+                        Debug.logError("Authorization failed : " + newPref + " : " + processorResult, MODULE);
                     }
                 } else {
-                    Debug.logError("Payment not authorized : " + newPref + " (no process result)", module);
+                    Debug.logError("Payment not authorized : " + newPref + " (no process result)", MODULE);
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "ERROR: cannot create new payment preference : " + newPref, module);
+            Debug.logError(e, "ERROR: cannot create new payment preference : " + newPref, MODULE);
         } catch (GeneralException e) {
             if (processorResult != null) {
-                Debug.logError(e, "Trouble processing the auth result: " + newPref + " : " + processorResult, module);
+                Debug.logError(e, "Trouble processing the auth result: " + newPref + " : " + processorResult, MODULE);
             } else {
-                Debug.logError(e, "Trouble authorizing the payment: " + newPref, module);
+                Debug.logError(e, "Trouble authorizing the payment: " + newPref, MODULE);
             }
         }
         return ServiceUtil.returnSuccess();
@@ -1699,11 +1699,11 @@ public class PaymentGatewayServices {
             paymentGatewayConfigId = paymentSettings.getString("paymentGatewayConfigId");
 
             if (serviceName == null) {
-                Debug.logError("Service name is null for payment setting; cannot process", module);
+                Debug.logError("Service name is null for payment setting; cannot process", MODULE);
                 return null;
             }
         } else {
-            Debug.logError("Invalid payment settings entity, no payment settings found", module);
+            Debug.logError("Invalid payment settings entity, no payment settings found", MODULE);
             return null;
         }
 
@@ -1723,13 +1723,13 @@ public class PaymentGatewayServices {
                     try {
                         authResult = processResult(dctx, processorResult, userLogin, paymentPref, locale);
                         if (!authResult) {
-                            Debug.logError("Re-Authorization failed : " + paymentPref + " : " + processorResult, module);
+                            Debug.logError("Re-Authorization failed : " + paymentPref + " : " + processorResult, MODULE);
                         }
                     } catch (GeneralException e) {
-                        Debug.logError(e, "Trouble processing the re-auth result : " + paymentPref + " : " + processorResult, module);
+                        Debug.logError(e, "Trouble processing the re-auth result : " + paymentPref + " : " + processorResult, MODULE);
                     }
                 } else {
-                    Debug.logError("Payment not re-authorized : " + paymentPref + " (no process result)", module);
+                    Debug.logError("Payment not re-authorized : " + paymentPref + " (no process result)", MODULE);
                 }
 
                 if (!authResult) {
@@ -1740,7 +1740,7 @@ public class PaymentGatewayServices {
                 // get the new auth transaction
                 authTrans = getAuthTransaction(paymentPref);
             } catch (GeneralException e) {
-                Debug.logError(e, "Error re-authorizing payment", module);
+                Debug.logError(e, "Error re-authorizing payment", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentReauthorizingError", locale));
             }
         }
@@ -1778,7 +1778,7 @@ public class PaymentGatewayServices {
         }
 
         if (Debug.infoOn()) {
-            Debug.logInfo("Capture [" + serviceName + "] : " + captureContext, module);
+            Debug.logInfo("Capture [" + serviceName + "] : " + captureContext, MODULE);
         }
         try {
             String paymentMethodTypeId = paymentPref.getString("paymentMethodTypeId");
@@ -1786,7 +1786,7 @@ public class PaymentGatewayServices {
                 getBillingInformation(orh, paymentPref, captureContext);
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         // now invoke the capture service
         Map<String, Object> captureResult = null;
@@ -1802,7 +1802,7 @@ public class PaymentGatewayServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(captureResult));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Could not capture payment ... serviceName: " + serviceName + " ... context: " + captureContext, module);
+            Debug.logError(e, "Could not capture payment ... serviceName: " + serviceName + " ... context: " + captureContext, MODULE);
             return null;
         }
 
@@ -1835,7 +1835,7 @@ public class PaymentGatewayServices {
         try {
             dispatcher.runAsync("processPaymentServiceError", serviceContext);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -1865,12 +1865,12 @@ public class PaymentGatewayServices {
         try {
             delegator.create(response);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingNoPaymentGatewayResponseCreatedForFailedService", locale));
         }
 
-        Debug.logInfo("Created PaymentGatewayResponse record for returned error", module);
+        Debug.logInfo("Created PaymentGatewayResponse record for returned error", MODULE);
         return ServiceUtil.returnSuccess();
     }
 
@@ -1911,7 +1911,7 @@ public class PaymentGatewayServices {
         try {
             resResp = dispatcher.runSync(model.name, context);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw e;
         }
         if (ServiceUtil.isError(resResp)) {
@@ -1929,7 +1929,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         
         if(authResult == null) {
-            Debug.logError("No authentification result available. Payment preference can't be checked.", module);
+            Debug.logError("No authentification result available. Payment preference can't be checked.", MODULE);
             return ServiceUtil
                     .returnError(UtilProperties.getMessage(resource, "AccountingProcessingAuthResultEmpty", locale));
         }
@@ -1938,7 +1938,7 @@ public class PaymentGatewayServices {
         try {
             orderPaymentPreference.refresh();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -2014,7 +2014,7 @@ public class PaymentGatewayServices {
             savePgrAndMsgs(dctx, response, messageEntities);
 
             if (response.getBigDecimal("amount").compareTo((BigDecimal)context.get("processAmount")) != 0) {
-                Debug.logWarning("The authorized amount does not match the max amount : Response - " + response + " : result - " + context, module);
+                Debug.logWarning("The authorized amount does not match the max amount : Response - " + response + " : result - " + context, MODULE);
             }
 
             // set the status of the OrderPaymentPreference
@@ -2074,7 +2074,7 @@ public class PaymentGatewayServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Error updating payment status information", module);
+            Debug.logError(e, "Error updating payment status information", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentStatusUpdatingError", UtilMisc.toMap("errorString", e.toString()), locale));
         }
 
@@ -2154,7 +2154,7 @@ public class PaymentGatewayServices {
         try {
             capRes = dispatcher.runSync("processCaptureResult", context);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw e;
         }
         if (capRes != null && ServiceUtil.isError(capRes)) {
@@ -2166,7 +2166,7 @@ public class PaymentGatewayServices {
                 processReAuthFromCaptureFailure(dctx, result, amount, userLogin, paymentPreference, locale);
             } catch (GeneralException e) {
                 // just log this for now (same as previous implementation)
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
     }
@@ -2197,9 +2197,9 @@ public class PaymentGatewayServices {
         }
         if (amount.compareTo(ZERO) == 0) {
             amount = paymentPreference.getBigDecimal("maxAmount");
-            Debug.logInfo("resetting payment amount from 0.00 to correctMax amount", module);
+            Debug.logInfo("resetting payment amount from 0.00 to correctMax amount", MODULE);
         }
-        Debug.logInfo("reauth with amount: " + amount, module);
+        Debug.logInfo("reauth with amount: " + amount, MODULE);
 
         // first re-auth the card
         Map<String, Object> authPayRes = authPayment(dispatcher, userLogin, orh, paymentPreference, amount, true, null);
@@ -2259,7 +2259,7 @@ public class PaymentGatewayServices {
         try {
             paymentPreference.refresh();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -2275,7 +2275,7 @@ public class PaymentGatewayServices {
         try {
             paymentPreference.store();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -2332,7 +2332,7 @@ public class PaymentGatewayServices {
                     invoice = EntityQuery.use(delegator).from("Invoice").where("invoiceId", invoiceId).queryOne();
                 } catch (GenericEntityException e) {
                     String message = UtilProperties.getMessage(resourceError, "AccountingFailedToProcessCaptureResult", UtilMisc.toMap("invoiceId", invoiceId, "errorString", e.getMessage()), locale);
-                    Debug.logError(e, message, module);
+                    Debug.logError(e, message, MODULE);
                     return ServiceUtil.returnError(message);
                 }
             }
@@ -2349,7 +2349,7 @@ public class PaymentGatewayServices {
                 try {
                     orderRole = EntityQuery.use(delegator).from("OrderRole").where("orderId", orderId, "roleTypeId", "BILL_TO_CUSTOMER").queryFirst();
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 }
                 if (orderRole != null) {
                     partyIdFrom = orderRole.getString("partyId");
@@ -2368,7 +2368,7 @@ public class PaymentGatewayServices {
                 // otherwise default to Company and print a big warning about this
                 partyIdTo = EntityUtilProperties.getPropertyValue("general", "ORGANIZATION_PARTY", "Company", delegator);
                 Debug.logWarning("Using default value of [" + partyIdTo + "] for payTo on invoice [" + invoiceId + "] and orderPaymentPreference [" +
-                        paymentPreference.getString("orderPaymentPreferenceId") + "]", module);
+                        paymentPreference.getString("orderPaymentPreferenceId") + "]", MODULE);
             }
 
 
@@ -2389,7 +2389,7 @@ public class PaymentGatewayServices {
             try {
                 payRes = dispatcher.runSync("createPayment", paymentCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                         "AccountingPaymentCreationError", locale));
             }
@@ -2401,7 +2401,7 @@ public class PaymentGatewayServices {
 
             // create the PaymentApplication if invoiceId is available
             if (invoiceId != null) {
-                Debug.logInfo("Processing Invoice #" + invoiceId, module);
+                Debug.logInfo("Processing Invoice #" + invoiceId, MODULE);
                 Map<String, Object> paCtx = UtilMisc.<String, Object>toMap("paymentId", paymentId, "invoiceId", invoiceId);
                 paCtx.put("amountApplied", context.get("captureAmount"));
                 paCtx.put("userLogin", userLogin);
@@ -2409,7 +2409,7 @@ public class PaymentGatewayServices {
                 try {
                     paRes = dispatcher.runSync("createPaymentApplication", paCtx);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                             "AccountingInvoiceApplicationCreationError", locale));
                 }
@@ -2432,7 +2432,7 @@ public class PaymentGatewayServices {
         try {
             orderPaymentPreference = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);
@@ -2449,7 +2449,7 @@ public class PaymentGatewayServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(refundResponse));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Problem refunding payment through processor", module);
+            Debug.logError(e, "Problem refunding payment through processor", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentRefundError", locale));
         }
@@ -2468,7 +2468,7 @@ public class PaymentGatewayServices {
         try {
             orderHeader = paymentPref.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get OrderHeader from OrderPaymentPreference", module);
+            Debug.logError(e, "Cannot get OrderHeader from OrderPaymentPreference", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     e.toString());
@@ -2514,7 +2514,7 @@ public class PaymentGatewayServices {
                 try {
                     refundResponse = dispatcher.runSync(serviceName, serviceContext, TX_TIME, true);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Problem refunding payment through processor", module);
+                    Debug.logError(e, "Problem refunding payment through processor", MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                             "AccountingPaymentRefundError", locale));
                 }
@@ -2550,7 +2550,7 @@ public class PaymentGatewayServices {
                         return ServiceUtil.returnError(ServiceUtil.getErrorMessage(refundResRes));
                     }
                 } catch (GeneralException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                             "AccountingPaymentRefundError", locale) + " " + e.getMessage());
                 }
@@ -2625,7 +2625,7 @@ public class PaymentGatewayServices {
             try {
                 paymentPref.store();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
 
             // handle the (reverse) payment
@@ -2652,7 +2652,7 @@ public class PaymentGatewayServices {
                     paymentId = (String) payRes.get("paymentId");
                 }
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problem creating Payment", module);
+                Debug.logError(e, "Problem creating Payment", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                         "AccountingPaymentCreationError", locale));
             }
@@ -2684,7 +2684,7 @@ public class PaymentGatewayServices {
         try {
             orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
 
@@ -2697,7 +2697,7 @@ public class PaymentGatewayServices {
         // check the current order status
         if (!"ORDER_CREATED".equals(orderHeader.getString("statusId"))) {
             // if we are out of the created status; then we were either cancelled, rejected or approved
-            Debug.logWarning("Was re-trying a failed auth for orderId [" + orderId + "] but it is not in the ORDER_CREATED status, so skipping.", module);
+            Debug.logWarning("Was re-trying a failed auth for orderId [" + orderId + "] but it is not in the ORDER_CREATED status, so skipping.", MODULE);
             return ServiceUtil.returnSuccess();
         }
 
@@ -2706,7 +2706,7 @@ public class PaymentGatewayServices {
         try {
             serviceResult = dispatcher.runSync("authOrderPayments", UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         if (ServiceUtil.isError(serviceResult)) {
@@ -2720,7 +2720,7 @@ public class PaymentGatewayServices {
         }
 
         if ("ERROR".equals(authResp)) {
-            Debug.logWarning("The payment processor had a failure in processing, will not modify any status", module);
+            Debug.logWarning("The payment processor had a failure in processing, will not modify any status", MODULE);
         } else {
             if ("FAILED".equals(authResp)) {
                 // declined; update the order status
@@ -2751,7 +2751,7 @@ public class PaymentGatewayServices {
         try (EntityListIterator eli = eq.queryIterator()) {
             List<String> processList = new LinkedList<>();
             if (eli != null) {
-                Debug.logInfo("Processing failed order re-auth(s)", module);
+                Debug.logInfo("Processing failed order re-auth(s)", MODULE);
                 GenericValue value = null;
                 while (((value = eli.next()) != null)) {
                     String orderId = value.getString("orderId");
@@ -2761,13 +2761,13 @@ public class PaymentGatewayServices {
                             dispatcher.runAsync("retryFailedOrderAuth", UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
                             processList.add(orderId);
                         } catch (GenericServiceException e) {
-                            Debug.logError(e, module);
+                            Debug.logError(e, MODULE);
                         }
                     }
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         return ServiceUtil.returnSuccess();
@@ -2793,7 +2793,7 @@ public class PaymentGatewayServices {
         try (EntityListIterator eli = eq.queryIterator()) {
             List<String> processList = new LinkedList<>();
             if (eli != null) {
-                Debug.logInfo("Processing failed order re-auth(s)", module);
+                Debug.logInfo("Processing failed order re-auth(s)", MODULE);
                 GenericValue value = null;
                 while (((value = eli.next()) != null)) {
                     String orderId = value.getString("orderId");
@@ -2803,13 +2803,13 @@ public class PaymentGatewayServices {
                             dispatcher.runAsync("retryFailedOrderAuth", UtilMisc.<String, Object>toMap("orderId", orderId, "userLogin", userLogin));
                             processList.add(orderId);
                         } catch (GenericServiceException e) {
-                            Debug.logError(e, module);
+                            Debug.logError(e, MODULE);
                         }
                     }
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         return ServiceUtil.returnSuccess();
     }
@@ -2825,7 +2825,7 @@ public class PaymentGatewayServices {
             List<GenericValue> capTransactions = EntityUtil.filterByAnd(transactions, exprs);
             capTrans = EntityUtil.getFirst(capTransactions);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "ERROR: Problem getting capture information from PaymentGatewayResponse", module);
+            Debug.logError(e, "ERROR: Problem getting capture information from PaymentGatewayResponse", MODULE);
         }
         return capTrans;
     }
@@ -2855,7 +2855,7 @@ public class PaymentGatewayServices {
                     EntityCondition.makeCondition("paymentServiceTypeEnumId", EntityOperator.EQUALS, REAUTH_SERVICE_TYPE));
             authTransactions = EntityUtil.filterByOr(transactions, exprs);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "ERROR: Problem getting authorization information from PaymentGatewayResponse", module);
+            Debug.logError(e, "ERROR: Problem getting authorization information from PaymentGatewayResponse", MODULE);
         }
         return authTransactions;
     }
@@ -2884,7 +2884,7 @@ public class PaymentGatewayServices {
         try {
             paymentMethod = orderPaymentPreference.getRelatedOne("PaymentMethod", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (paymentMethod != null && "CREDIT_CARD".equals(paymentMethod.getString("paymentMethodTypeId"))) {
@@ -2892,7 +2892,7 @@ public class PaymentGatewayServices {
             try {
                 creditCard = paymentMethod.getRelatedOne("CreditCard", false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (creditCard != null) {
                 String cardType = creditCard.getString("cardType");
@@ -2919,7 +2919,7 @@ public class PaymentGatewayServices {
             try {
                 days = Integer.parseInt(reauthDays);
             } catch (Exception e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
 
             if (days > 0) {
@@ -2952,9 +2952,9 @@ public class PaymentGatewayServices {
             dispatcher.addRollbackService("savePaymentGatewayResponse", context, true);
             delegator.create(pgr);
         } catch (GenericEntityException | GenericServiceException ge) {
-            Debug.logError(ge, module);
+            Debug.logError(ge, MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -2970,9 +2970,9 @@ public class PaymentGatewayServices {
                 delegator.create(message);
             }
         } catch (GenericEntityException | GenericServiceException ge) {
-            Debug.logError(ge, module);
+            Debug.logError(ge, MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -2989,7 +2989,7 @@ public class PaymentGatewayServices {
         try {
             delegator.create(pgr);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         return ServiceUtil.returnSuccess();
@@ -3011,7 +3011,7 @@ public class PaymentGatewayServices {
                 delegator.create(message);
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         return ServiceUtil.returnSuccess();
@@ -3027,7 +3027,7 @@ public class PaymentGatewayServices {
 
         // security check
         if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_CREATE", userLogin)) {
-            Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
+            Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentTransactionNotAuthorized", locale));
         }
@@ -3042,7 +3042,7 @@ public class PaymentGatewayServices {
         try {
             paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (paymentMethod == null || !"CREDIT_CARD".equals(paymentMethod.getString("paymentMethodTypeId"))) {
@@ -3055,7 +3055,7 @@ public class PaymentGatewayServices {
         try {
             billToParty = paymentMethod.getRelatedOne("Party", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -3064,7 +3064,7 @@ public class PaymentGatewayServices {
         try {
             creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (UtilValidate.isEmpty(creditCard)) {
@@ -3130,10 +3130,10 @@ public class PaymentGatewayServices {
         // call the auth service
         Map<String, Object> response;
         try {
-            Debug.logInfo("Running authorization service: " + paymentService, module);
+            Debug.logInfo("Running authorization service: " + paymentService, MODULE);
             response = dispatcher.runSync(paymentService, authContext, TX_TIME, true);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentServiceError",
                     UtilMisc.toMap("paymentService", paymentService, "authContext", authContext),
@@ -3144,7 +3144,7 @@ public class PaymentGatewayServices {
         }
 
         Boolean authResult = (Boolean) response.get("authResult");
-        Debug.logInfo("Authorization service returned: " + authResult, module);
+        Debug.logInfo("Authorization service returned: " + authResult, MODULE);
         if (authResult != null && authResult) {
             return ServiceUtil.returnSuccess();
         } else {
@@ -3162,7 +3162,7 @@ public class PaymentGatewayServices {
         Security security = dctx.getSecurity();
         // security check
         if (!security.hasEntityPermission("MANUAL", "_PAYMENT", userLogin) && !security.hasEntityPermission("ACCOUNTING", "_CREATE", userLogin)) {
-            Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", module);
+            Debug.logWarning("**** Security [" + (new Date()).toString() + "]: " + userLogin.get("userLoginId") + " attempt to run manual payment transaction!", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentTransactionNotAuthorized", locale));
         }
@@ -3180,7 +3180,7 @@ public class PaymentGatewayServices {
             paymentPref = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderPaymentPreferenceId", orderPaymentPreferenceId).queryOne();
         } catch (GenericEntityException e) {
             Debug.logWarning(e, "Problem getting OrderPaymentPreference for orderPaymentPreferenceId " + 
-                    orderPaymentPreferenceId, module);
+                    orderPaymentPreferenceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);
@@ -3188,7 +3188,7 @@ public class PaymentGatewayServices {
         // Error if no OrderPaymentPreference was found
         if (paymentPref == null) {
             Debug.logWarning("Could not find OrderPaymentPreference with orderPaymentPreferenceId: " + 
-                    orderPaymentPreferenceId, module);
+                    orderPaymentPreferenceId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingProblemGettingOrderPaymentPreferences", locale) + " " + 
                     orderPaymentPreferenceId);            
@@ -3199,13 +3199,13 @@ public class PaymentGatewayServices {
         try {
             orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, module);
+            Debug.logWarning(e, "Problem getting OrderHeader for orderId " + orderId, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
         // Error if no OrderHeader was found
         if (orderHeader == null) {
-            Debug.logWarning("Could not find OrderHeader with orderId: " + orderId + "; not processing payments.", module);
+            Debug.logWarning("Could not find OrderHeader with orderId: " + orderId + "; not processing payments.", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -3292,7 +3292,7 @@ public class PaymentGatewayServices {
                 return ServiceUtil.returnError(ServiceUtil.getErrorMessage(response));
             }
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentServiceError",
                     UtilMisc.toMap("paymentService", paymentService, "authContext", requestContext),
@@ -3308,7 +3308,7 @@ public class PaymentGatewayServices {
                 Map<String, Object> resCtx = model.makeValid(response, ModelService.IN_PARAM);
                 responseRes = dispatcher.runSync(model.name,  resCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                         "AccountingPaymentCreditError",
                         UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -3345,7 +3345,7 @@ public class PaymentGatewayServices {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         Locale locale = (Locale) context.get("locale");
         if (Debug.infoOn()) {
-            Debug.logInfo("Running verifyCreditCard [ " + paymentMethodId + "] for store: " + productStoreId, module);
+            Debug.logInfo("Running verifyCreditCard [ " + paymentMethodId + "] for store: " + productStoreId, MODULE);
         }
 
         GenericValue productStore = null;
@@ -3363,7 +3363,7 @@ public class PaymentGatewayServices {
             amount = EntityUtilProperties.getPropertyValue(productStorePaymentProperties, "payment.general.cc_update.auth", delegator);
         }
         if (Debug.infoOn()) {
-            Debug.logInfo("Running credit card verification [" + paymentMethodId + "] (" + amount + ") : " + productStorePaymentProperties + " : " + mode, module);
+            Debug.logInfo("Running credit card verification [" + paymentMethodId + "] (" + amount + ") : " + productStorePaymentProperties + " : " + mode, MODULE);
         }
 
         if (UtilValidate.isNotEmpty(amount)) {
@@ -3379,7 +3379,7 @@ public class PaymentGatewayServices {
                 try {
                     results = dispatcher.runSync("manualForcedCcAuthTransaction", ccAuthContext);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
 
@@ -3502,7 +3502,7 @@ public class PaymentGatewayServices {
     public static Map<String, Object> alwaysApproveProcessor(DispatchContext dctx, Map<String, ? extends Object> context) {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = new HashMap<>();
-        Debug.logInfo("Test Processor Approving Credit Card", module);
+        Debug.logInfo("Test Processor Approving Credit Card", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3521,7 +3521,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = new HashMap<>();
         String refNum = UtilDateTime.nowAsString();
-        Debug.logInfo("Test Processor Approving Credit Card with Capture", module);
+        Debug.logInfo("Test Processor Approving Credit Card with Capture", MODULE);
 
         result.put("authResult", Boolean.TRUE);
         result.put("captureResult", Boolean.TRUE);
@@ -3546,7 +3546,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         BigDecimal processAmount = (BigDecimal) context.get("processAmount");
-        Debug.logInfo("Test Processor Declining Credit Card", module);
+        Debug.logInfo("Test Processor Declining Credit Card", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3567,7 +3567,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         BigDecimal processAmount = (BigDecimal) context.get("processAmount");
-        Debug.logInfo("Test Processor NSF Credit Card", module);
+        Debug.logInfo("Test Processor NSF Credit Card", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3589,7 +3589,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         BigDecimal processAmount = (BigDecimal) context.get("processAmount");
-        Debug.logInfo("Test Processor Bad Expire Date Credit Card", module);
+        Debug.logInfo("Test Processor Bad Expire Date Credit Card", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3627,7 +3627,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         BigDecimal processAmount = (BigDecimal) context.get("processAmount");
-        Debug.logInfo("Test Processor Bad Card Number Credit Card", module);
+        Debug.logInfo("Test Processor Bad Card Number Credit Card", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3671,7 +3671,7 @@ public class PaymentGatewayServices {
     public static Map<String, Object> testCapture(DispatchContext dctx, Map<String, ? extends Object> context) {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
-        Debug.logInfo("Test Capture Process", module);
+        Debug.logInfo("Test Capture Process", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3691,7 +3691,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
         BigDecimal processAmount = (BigDecimal) context.get("captureAmount");
-        Debug.logInfo("Test Processor Declining Credit Card capture", module);
+        Debug.logInfo("Test Processor Declining Credit Card capture", MODULE);
 
         String refNum = UtilDateTime.nowAsString();
 
@@ -3708,7 +3708,7 @@ public class PaymentGatewayServices {
         Locale locale = (Locale) context.get("locale");
         GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
         GenericValue authTransaction = (GenericValue) context.get("authTrans");
-        Debug.logInfo("Test Capture with 2 minute delay failure/re-auth process", module);
+        Debug.logInfo("Test Capture with 2 minute delay failure/re-auth process", MODULE);
 
         if (authTransaction == null) {
             authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
@@ -3730,7 +3730,7 @@ public class PaymentGatewayServices {
         cal.add(Calendar.MINUTE, 2);
         Timestamp twoMinAfter = new Timestamp(cal.getTimeInMillis());
         if (Debug.infoOn()) {
-            Debug.logInfo("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, module);
+            Debug.logInfo("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, MODULE);
         }
 
         if (nowStamp.after(twoMinAfter)) {
@@ -3750,7 +3750,7 @@ public class PaymentGatewayServices {
     public static Map<String, Object> testRefund(DispatchContext dctx, Map<String, ? extends Object> context) {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
-        Debug.logInfo("Test Refund Process", module);
+        Debug.logInfo("Test Refund Process", MODULE);
 
         result.put("refundResult", Boolean.TRUE);
         result.put("refundAmount", context.get("refundAmount"));
@@ -3764,7 +3764,7 @@ public class PaymentGatewayServices {
     public static Map<String, Object> testRefundFailure(DispatchContext dctx, Map<String, ? extends Object> context) {
         Locale locale = (Locale) context.get("locale");
         Map<String, Object> result = ServiceUtil.returnSuccess();
-        Debug.logInfo("Test Refund Process", module);
+        Debug.logInfo("Test Refund Process", MODULE);
 
         result.put("refundResult", Boolean.FALSE);
         result.put("refundAmount", context.get("refundAmount"));
@@ -3784,7 +3784,7 @@ public class PaymentGatewayServices {
                 serviceName = customMethod.getString("customMethodName");
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         return serviceName;
     }
@@ -3796,7 +3796,7 @@ public class PaymentGatewayServices {
         try {
             returnItemResponses = orderHeader.getRelated("ReplacementReturnItemResponse", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return replacementOrderFlag;
         }
         if (UtilValidate.isNotEmpty(returnItemResponses)) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
index 36116ee..f4e7d2e 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentMethodServices.java
@@ -48,7 +48,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class PaymentMethodServices {
 
-    public final static String module = PaymentMethodServices.class.getName();
+    public final static String MODULE = PaymentMethodServices.class.getName();
     public final static String resource = "AccountingUiLabels";
     public static final String resourceError = "AccountingUiLabels";
 
@@ -75,7 +75,7 @@ public class PaymentMethodServices {
         try {
             paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.toString(), module);
+            Debug.logWarning(e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingPaymentMethodCannotBeDeleted",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -99,7 +99,7 @@ public class PaymentMethodServices {
         try {
             paymentMethod.store();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.toString(), module);
+            Debug.logWarning(e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingPaymentMethodCannotBeDeletedWriteFailure", 
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -220,7 +220,7 @@ public class PaymentMethodServices {
                 allPCWPs = EntityUtil.filterByDate(allPCWPs, now, "purposeFromDate", "purposeThruDate", true);
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -238,7 +238,7 @@ public class PaymentMethodServices {
         try {
             delegator.storeAll(toBeStored);
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingCreditCardCreateWriteFailure", locale) + e.getMessage());
         }
@@ -283,7 +283,7 @@ public class PaymentMethodServices {
             creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne();
             paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCreditCardUpdateReadFailure", locale) + e.getMessage());
         }
@@ -401,7 +401,7 @@ public class PaymentMethodServices {
 
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -424,7 +424,7 @@ public class PaymentMethodServices {
             try {
                 delegator.storeAll(toBeStored);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                         "AccountingCreditCardUpdateWriteFailure", locale) + e.getMessage());
             }
@@ -457,7 +457,7 @@ public class PaymentMethodServices {
         try {
             creditCard = EntityQuery.use(delegator).from("CreditCard").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -467,7 +467,7 @@ public class PaymentMethodServices {
         try {
             delegator.store(creditCard);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -479,7 +479,7 @@ public class PaymentMethodServices {
         try {
             expireResp = dispatcher.runSync("deletePaymentMethod", expireCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(expireResp)) {
@@ -536,7 +536,7 @@ public class PaymentMethodServices {
         try {
             delegator.storeAll(toBeStored);
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCardCannotBeCreatedWriteFailure",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -575,7 +575,7 @@ public class PaymentMethodServices {
             giftCard = EntityQuery.use(delegator).from("GiftCard").where("paymentMethodId", paymentMethodId).queryOne();
             paymentMethod = EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCardCannotBeUpdated",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -654,7 +654,7 @@ public class PaymentMethodServices {
             try {
                 delegator.storeAll(toBeStored);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                         "AccountingEftAccountCannotBeUpdated",
                         UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -747,7 +747,7 @@ public class PaymentMethodServices {
 
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -766,7 +766,7 @@ public class PaymentMethodServices {
         try {
             delegator.storeAll(toBeStored);
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingEftAccountCannotBeCreatedWriteFailure",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -813,7 +813,7 @@ public class PaymentMethodServices {
             paymentMethod =
                 EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingEftAccountCannotBeUpdatedReadFailure",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -877,7 +877,7 @@ public class PaymentMethodServices {
                 allPCWPs = EntityUtil.filterByDate(allPCWPs, now, "purposeFromDate", "purposeThruDate", true);
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -890,7 +890,7 @@ public class PaymentMethodServices {
         }
 
         if (isModified) {
-            // Debug.logInfo("yes, is modified", module);
+            // Debug.logInfo("yes, is modified", MODULE);
             if (newPartyContactMechPurpose != null) {
                 toBeStored.add(newPartyContactMechPurpose);
             }
@@ -902,7 +902,7 @@ public class PaymentMethodServices {
             try {
                 delegator.storeAll(toBeStored);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                         "AccountingEftAccountCannotBeUpdated",
                         UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -982,7 +982,7 @@ public class PaymentMethodServices {
 
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -1001,7 +1001,7 @@ public class PaymentMethodServices {
         try {
             delegator.storeAll(toBeStored);
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, "AccountingCheckNotAdded", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
 
@@ -1039,7 +1039,7 @@ public class PaymentMethodServices {
             paymentMethod =
                     EntityQuery.use(delegator).from("PaymentMethod").where("paymentMethodId", paymentMethodId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e.getMessage(), module);
+            Debug.logWarning(e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingCheckAccountCannotBeUpdated",
                     UtilMisc.toMap("errorString", e.getMessage()), locale));
@@ -1103,7 +1103,7 @@ public class PaymentMethodServices {
                 allPCWPs = EntityUtil.filterByDate(allPCWPs, now, "purposeFromDate", "purposeThruDate", true);
                 tempVal = EntityUtil.getFirst(allPCWPs);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 tempVal = null;
             }
 
@@ -1116,7 +1116,7 @@ public class PaymentMethodServices {
         }
 
         if (isModified) {
-            // Debug.logInfo("yes, is modified", module);
+            // Debug.logInfo("yes, is modified", MODULE);
             if (newPartyContactMechPurpose != null) {
                 toBeStored.add(newPartyContactMechPurpose);
             }
@@ -1128,7 +1128,7 @@ public class PaymentMethodServices {
             try {
                 delegator.storeAll(toBeStored);
             } catch (GenericEntityException e) {
-                Debug.logWarning(e.getMessage(), module);
+                Debug.logWarning(e.getMessage(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                         "AccountingCheckAccountCannotBeUpdated",
                         UtilMisc.toMap("errorString", e.getMessage()), locale));
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
index 016a7d3..5f14d24 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentWorker.java
@@ -48,7 +48,7 @@ import org.apache.ofbiz.entity.util.EntityUtil;
  */
 public final class PaymentWorker {
 
-    public static final String module = PaymentWorker.class.getName();
+    public static final String MODULE = PaymentWorker.class.getName();
     private static final int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static final RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
 
@@ -106,7 +106,7 @@ public final class PaymentWorker {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, module);
+            Debug.logWarning(e, MODULE);
         }
         return paymentMethodValueMaps;
     }
@@ -149,7 +149,7 @@ public final class PaymentWorker {
                 eftAccount = EntityQuery.use(delegator).from("EftAccount").where("paymentMethodId", paymentMethodId).queryOne();
                 checkAccount = EntityQuery.use(delegator).from("CheckAccount").where("paymentMethodId", paymentMethodId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logWarning(e, module);
+                Debug.logWarning(e, MODULE);
             }
         }
         if (paymentMethod != null) {
@@ -199,7 +199,7 @@ public final class PaymentWorker {
                     .orderBy("-purposeFromDate").filterByDate("contactFromDate", "contactThruDate", "purposeFromDate", "purposeThruDate")
                     .queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting PartyContactWithPurpose view entity list", module);
+            Debug.logError(e, "Trouble getting PartyContactWithPurpose view entity list", MODULE);
         }
 
         // get the address for the primary contact mech
@@ -208,7 +208,7 @@ public final class PaymentWorker {
             try {
                 postalAddress = EntityQuery.use(delegator).from("PostalAddress").where("contactMechId", purpose.getString("contactMechId")).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Trouble getting PostalAddress record for contactMechId: " + purpose.getString("contactMechId"), module);
+                Debug.logError(e, "Trouble getting PostalAddress record for contactMechId: " + purpose.getString("contactMechId"), MODULE);
             }
         }
 
@@ -253,7 +253,7 @@ public final class PaymentWorker {
         try {
             payment = EntityQuery.use(delegator).from("Payment").where("paymentId", paymentId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Payment", module);
+            Debug.logError(e, "Problem getting Payment", MODULE);
         }
 
         if (payment == null) {
@@ -283,7 +283,7 @@ public final class PaymentWorker {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Payment", module);
+            Debug.logError(e, "Problem getting Payment", MODULE);
         }
         return appliedAmount;
     }
@@ -327,7 +327,7 @@ public final class PaymentWorker {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Trouble getting entities", module);
+            Debug.logError(e, "Trouble getting entities", MODULE);
         }
         return paymentApplied;
     }
@@ -359,7 +359,7 @@ public final class PaymentWorker {
         try {
             payment = EntityQuery.use(delegator).from("Payment").where("paymentId", paymentId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problem getting Payment", module);
+            Debug.logError(e, "Problem getting Payment", MODULE);
         }
 
         if (payment == null) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
index 58d9ce0..52daca6 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/period/PeriodServices.java
@@ -39,7 +39,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class PeriodServices {
 
-    public static final String module = PeriodServices.class.getName();
+    public static final String MODULE = PeriodServices.class.getName();
     public static final String resource = "AccountingUiLabels";
 
     /*
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
index a572eba..0228789 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/tax/TaxAuthorityServices.java
@@ -54,7 +54,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class TaxAuthorityServices {
 
-    public static final String module = TaxAuthorityServices.class.getName();
+    public static final String MODULE = TaxAuthorityServices.class.getName();
     public static final BigDecimal ZERO_BASE = BigDecimal.ZERO;
     public static final BigDecimal ONE_BASE = BigDecimal.ONE;
     public static final BigDecimal PERCENT_SCALE = new BigDecimal("100.000");
@@ -128,7 +128,7 @@ public class TaxAuthorityServices {
                     // such, so don't blow up on it...
                     Debug.logWarning("Could not find any Tax Authories Rate Rules for store with ID [" + productStoreId
                             + "], productId [" + productId + "], basePrice [" + basePrice + "], amount [" + amount
-                            + "], for tax calculation; the store settings may need to be corrected.", module);
+                            + "], for tax calculation; the store settings may need to be corrected.", MODULE);
                 }
 
                 // add up amounts from adjustments (amount OR exemptAmount, sourcePercentage)
@@ -142,12 +142,12 @@ public class TaxAuthorityServices {
                         Debug.logInfo("For productId [" + productId + "] added [" + adjAmount.divide(quantity,
                                 salestaxCalcDecimals, salestaxRounding) + "] of tax to price for geoId ["
                                 + taxAdjustment.getString("taxAuthGeoId") + "], new price is [" + priceWithTax + "]",
-                                module);
+                                MODULE);
                     }
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Data error getting tax settings: " + e.toString(), module);
+            Debug.logError(e, "Data error getting tax settings: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingTaxSettingError", UtilMisc
                     .toMap("errorString", e.toString()), locale));
         }
@@ -191,7 +191,7 @@ public class TaxAuthorityServices {
                 facility = EntityQuery.use(delegator).from("Facility").where("facilityId", facilityId).queryOne();
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Data error getting tax settings: " + e.toString(), module);
+            Debug.logError(e, "Data error getting tax settings: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingTaxSettingError", UtilMisc
                     .toMap("errorString", e.toString()), locale));
         }
@@ -211,7 +211,7 @@ public class TaxAuthorityServices {
                             facilityContactMech.get("contactMechId")).queryOne();
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Data error getting tax settings: " + e.toString(), module);
+                Debug.logError(e, "Data error getting tax settings: " + e.toString(), MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingTaxSettingError", UtilMisc
                         .toMap("errorString", e.toString()), locale));
             }
@@ -225,7 +225,7 @@ public class TaxAuthorityServices {
                                 "address1"), "postalCodeGeoId", shippingAddress.get("postalCodeGeoId"),
                         "stateProvinceGeoId", shippingAddress.get("stateProvinceGeoId"), "countryGeoId", shippingAddress
                                 .get("countryGeoId")), locale);
-                Debug.logError(errMsg, module);
+                Debug.logError(errMsg, MODULE);
             }
             return ServiceUtil.returnError(errMsg);
         }
@@ -236,7 +236,7 @@ public class TaxAuthorityServices {
         try {
             getTaxAuthorities(delegator, shippingAddress, taxAuthoritySet);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Data error getting tax settings: " + e.toString(), module);
+            Debug.logError(e, "Data error getting tax settings: " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingTaxSettingError", UtilMisc
                     .toMap("errorString", e.toString()), locale));
         }
@@ -316,7 +316,7 @@ public class TaxAuthorityServices {
                 geoIdByTypeMap.put("POSTAL_CODE", postalCodeGeoId);
             }
         } else {
-            Debug.logWarning("shippingAddress was null, adding nothing to taxAuthoritySet", module);
+            Debug.logWarning("shippingAddress was null, adding nothing to taxAuthoritySet", MODULE);
         }
 
         // get the most granular, or all available, geoIds and then find parents by
@@ -429,7 +429,7 @@ public class TaxAuthorityServices {
 
             if (lookupList.size() == 0) {
                 Debug.logWarning("In TaxAuthority Product Rate no records were found for condition:" + mainCondition
-                        .toString(), module);
+                        .toString(), MODULE);
                 return adjustments;
             }
 
@@ -577,7 +577,7 @@ public class TaxAuthorityServices {
                 } else {
                     Debug.logInfo(
                             "NOTE: A tax calculation was done without a billToPartyId or taxAuthGeoId, so no tax exemptions or tax IDs considered; billToPartyId=["
-                                    + billToPartyId + "] taxAuthGeoId=[" + taxAuthGeoId + "]", module);
+                                    + billToPartyId + "] taxAuthGeoId=[" + taxAuthGeoId + "]", MODULE);
                 }
                 if (discountedSalesTax.compareTo(BigDecimal.ZERO) < 0) {
                     GenericValue taxAdjValueNegative = delegator.makeValue("OrderAdjustment");
@@ -651,7 +651,7 @@ public class TaxAuthorityServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Problems looking up tax rates", module);
+            Debug.logError(e, "Problems looking up tax rates", MODULE);
             return new LinkedList<>();
         }
 
@@ -715,7 +715,7 @@ public class TaxAuthorityServices {
     private static void handlePartyTaxExempt(GenericValue adjValue, Set<String> billToPartyIdSet, String taxAuthGeoId,
             String taxAuthPartyId, BigDecimal taxAmount, Timestamp nowTimestamp, Delegator delegator)
             throws GenericEntityException {
-        Debug.logInfo("Checking for tax exemption : " + taxAuthGeoId + " / " + taxAuthPartyId, module);
+        Debug.logInfo("Checking for tax exemption : " + taxAuthGeoId + " / " + taxAuthPartyId, MODULE);
         List<EntityCondition> ptiConditionList = UtilMisc.<EntityCondition>toList(
                 EntityCondition.makeCondition("partyId", EntityOperator.IN, billToPartyIdSet),
                 EntityCondition.makeCondition("taxAuthGeoId", EntityOperator.EQUALS, taxAuthGeoId),
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
index 8bcbfd0..e0b125f 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/authorizedotnet/AIMPaymentServices.java
@@ -49,7 +49,7 @@ import com.ibm.icu.util.Calendar;
 
 public class AIMPaymentServices {
 
-    public static final String module = AIMPaymentServices.class.getName();
+    public static final String MODULE = AIMPaymentServices.class.getName();
     public final static String resource = "AccountingUiLabels";
 
     // The list of refund failure response codes that would cause the ccRefund service
@@ -110,7 +110,7 @@ public class AIMPaymentServices {
         try {
             creditCard = delegator.getRelatedOne("CreditCard",orderPaymentPreference, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -157,7 +157,7 @@ public class AIMPaymentServices {
         try {
             creditCard = delegator.getRelatedOne("CreditCard", orderPaymentPreference, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -212,7 +212,7 @@ public class AIMPaymentServices {
                 canDoVoid = true;
             }
             if (canDoVoid) {
-                Debug.logWarning("Refund was unsuccessful; will now attempt a VOID transaction.", module);
+                Debug.logWarning("Refund was unsuccessful; will now attempt a VOID transaction.", MODULE);
                 BigDecimal authAmountObj = authTransaction.getBigDecimal("amount");
                 BigDecimal refundAmountObj = (BigDecimal)context.get("refundAmount");
                 BigDecimal authAmount = authAmountObj != null ? authAmountObj : BigDecimal.ZERO;
@@ -321,9 +321,9 @@ public class AIMPaymentServices {
                     "AccountingAuthorizeNetTransactionUrlNotFound", locale));
         }
         if (isTestMode()) {
-            Debug.logInfo("TEST Authorize.net using url [" + url + "]", module);
-            Debug.logInfo("TEST Authorize.net request string " + request.toString(),module);
-            Debug.logInfo("TEST Authorize.net properties string " + props.toString(),module);
+            Debug.logInfo("TEST Authorize.net using url [" + url + "]", MODULE);
+            Debug.logInfo("TEST Authorize.net request string " + request.toString(),MODULE);
+            Debug.logInfo("TEST Authorize.net properties string " + props.toString(),MODULE);
         }
         
         // card present has a different layout from standard AIM; this determines how to parse the response
@@ -334,7 +334,7 @@ public class AIMPaymentServices {
             String certificateAlias = props.getProperty("certificateAlias");
             httpClient.setClientCertificateAlias(certificateAlias);
             String httpResponse = httpClient.post();
-            Debug.logInfo("transaction response: " + httpResponse,module);
+            Debug.logInfo("transaction response: " + httpResponse,MODULE);
             AuthorizeResponse ar = new AuthorizeResponse(httpResponse, apiType);            
             if (ar.isApproved()) {            
                 result.put("authResult", Boolean.TRUE);
@@ -347,16 +347,16 @@ public class AIMPaymentServices {
             } else {
                 result.put("authResult", Boolean.FALSE);
                 if (Debug.infoOn()) {
-                    Debug.logInfo("transactionId:  " + ar.getTransactionId(), module);
-                    Debug.logInfo("responseCode:   " + ar.getResponseCode(), module);
-                    Debug.logInfo("responseReason: " + ar.getReasonCode(), module);
-                    Debug.logInfo("reasonText:     " + ar.getReasonText(), module);
+                    Debug.logInfo("transactionId:  " + ar.getTransactionId(), MODULE);
+                    Debug.logInfo("responseCode:   " + ar.getResponseCode(), MODULE);
+                    Debug.logInfo("responseReason: " + ar.getReasonCode(), MODULE);
+                    Debug.logInfo("reasonText:     " + ar.getReasonText(), MODULE);
                 }
             }
             result.put("httpResponse", httpResponse);
             result.put("authorizeResponse", ar);
         } catch (HttpClientException e) {
-            Debug.logInfo(e, "Could not complete Authorize.Net transaction: " + e.toString(),module);
+            Debug.logInfo(e, "Could not complete Authorize.Net transaction: " + e.toString(),MODULE);
         }
         result.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
         return result;
@@ -395,14 +395,14 @@ public class AIMPaymentServices {
             ver = "3.0";
         }
         if (UtilValidate.isEmpty(login)) {
-            Debug.logInfo("the login property in " + configStr + " is not configured.", module);
+            Debug.logInfo("the login property in " + configStr + " is not configured.", MODULE);
         }
         if (UtilValidate.isEmpty(password) && !("3.1".equals(ver))) {
-            Debug.logInfo("The password property in " + configStr + " is not configured.", module);
+            Debug.logInfo("The password property in " + configStr + " is not configured.", MODULE);
         }
         if ("3.1".equals(ver)) {
             if (UtilValidate.isEmpty(tranKey)) {
-                Debug.logInfo("Trankey property required for version 3.1 reverting to 3.0",module);
+                Debug.logInfo("Trankey property required for version 3.1 reverting to 3.0",MODULE);
                 ver = "3.0";
             }
         }
@@ -436,7 +436,7 @@ public class AIMPaymentServices {
             AIMProperties = props;
         }
         if (isTestMode()) {
-            Debug.logInfo("Created Authorize.Net properties file: " + props.toString(), module);
+            Debug.logInfo("Created Authorize.Net properties file: " + props.toString(), MODULE);
         }
         return props;
     }
@@ -522,7 +522,7 @@ public class AIMPaymentServices {
                         }
                     }                    
                 } else {
-                    Debug.logWarning("Payment preference " + opp + " is not a credit card", module);
+                    Debug.logWarning("Payment preference " + opp + " is not a credit card", MODULE);
                 }
             } else {
                 // this would be the case for an authorization
@@ -538,7 +538,7 @@ public class AIMPaymentServices {
             }
             return;
         } catch (GenericEntityException ex) {
-            Debug.logError("Cannot build customer information for " + params + " due to error: " + ex.getMessage(), module);
+            Debug.logError("Cannot build customer information for " + params + " due to error: " + ex.getMessage(), MODULE);
             return;
         }
     }
@@ -626,7 +626,7 @@ public class AIMPaymentServices {
         if (AIMRequest.get("x_market_type") != null) {
             AIMRequest.put("x_card_type", getCardType(UtilFormatOut.checkNull(cc.getString("cardType"))));
         }
-        Debug.logInfo("buildCaptureTransaction. " + at.toString(), module);
+        Debug.logInfo("buildCaptureTransaction. " + at.toString(), MODULE);
     }
 
     private static void buildVoidTransaction(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) {
@@ -638,7 +638,7 @@ public class AIMPaymentServices {
         AIMRequest.put("x_ref_trans_id", at.get("referenceNum"));
         AIMRequest.put("x_Trans_ID", at.get("referenceNum"));
         AIMRequest.put("x_Auth_Code", at.get("gatewayCode"));
-        Debug.logInfo("buildVoidTransaction. " + at.toString(), module);
+        Debug.logInfo("buildVoidTransaction. " + at.toString(), MODULE);
     }
 
     private static Map<String, Object> validateRequest(Map<String, Object> params, Properties props, Map<String, Object> AIMRequest) {
@@ -670,12 +670,12 @@ public class AIMPaymentServices {
                 results.put("authRefNum", AuthorizeResponse.ERROR);
             }
         } catch (Exception ex) {
-            Debug.logError(ex, module);
+            Debug.logError(ex, MODULE);
             results.put("authCode", ar.getResponseCode());
             results.put("processAmount", BigDecimal.ZERO);
             results.put("authRefNum", AuthorizeResponse.ERROR);
         }
-        Debug.logInfo("processAuthTransResult: " + results.toString(),module);
+        Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE);
     }
 
     private static void processCaptureTransResult(Map<String, Object> request, Map<String, Object> reply, Map<String, Object> results) {
@@ -697,10 +697,10 @@ public class AIMPaymentServices {
                 results.put("captureAmount", BigDecimal.ZERO);
             }
         } catch (Exception ex) {
-            Debug.logError(ex, module);
+            Debug.logError(ex, MODULE);
             results.put("captureAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("captureRefNum: " + results.toString(),module);
+        Debug.logInfo("captureRefNum: " + results.toString(),MODULE);
     }
 
     private static Map<String, Object> processRefundTransResult(Map<String, Object> request, Map<String, Object> reply) {
@@ -723,10 +723,10 @@ public class AIMPaymentServices {
                 results.put("refundAmount", BigDecimal.ZERO);
             }
         } catch (Exception ex) {
-            Debug.logError(ex, module);
+            Debug.logError(ex, MODULE);
             results.put("refundAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("processRefundTransResult: " + results.toString(),module);
+        Debug.logInfo("processRefundTransResult: " + results.toString(),MODULE);
         return results;
     }
 
@@ -750,10 +750,10 @@ public class AIMPaymentServices {
                 results.put("releaseAmount", BigDecimal.ZERO);
             }
         } catch (Exception ex) {
-            Debug.logError(ex, module);
+            Debug.logError(ex, MODULE);
             results.put("releaseAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("processReleaseTransResult: " + results.toString(),module);
+        Debug.logInfo("processReleaseTransResult: " + results.toString(),MODULE);
         return results;
     }
 
@@ -784,12 +784,12 @@ public class AIMPaymentServices {
             results.put("authRefNum", AuthorizeResponse.ERROR);
         }
         } catch (Exception ex) {
-            Debug.logError(ex, module);
+            Debug.logError(ex, MODULE);
             results.put("authCode", ar.getResponseCode());
             results.put("processAmount", BigDecimal.ZERO);
             results.put("authRefNum", AuthorizeResponse.ERROR);
         }
-        Debug.logInfo("processAuthTransResult: " + results.toString(),module);
+        Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE);
     }
 
     private static String getPaymentGatewayConfigValue(Delegator delegator, String paymentGatewayConfigId, String paymentGatewayConfigParameterName,
@@ -805,7 +805,7 @@ public class AIMPaymentServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
@@ -833,7 +833,7 @@ public class AIMPaymentServices {
                 BigDecimal amount = new BigDecimal((String) request.get("x_Amount"));
                 amt = amount;
             } catch (NumberFormatException e) {
-                Debug.logWarning(e, e.getMessage(), module);
+                Debug.logWarning(e, e.getMessage(), MODULE);
             }
         }
         return amt;
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
index 8ba404a..16ca7d4 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java
@@ -53,7 +53,7 @@ import org.w3c.dom.Element;
  */
 public class CCPaymentServices {
 
-    public final static String module = CCPaymentServices.class.getName();
+    public final static String MODULE = CCPaymentServices.class.getName();
     private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     public final static String resource = "AccountingUiLabels";
@@ -607,7 +607,7 @@ public class CCPaymentServices {
                 try {
                     severity = Integer.parseInt(UtilXml.childElementValue(messageElement, "Sev"));
                 } catch (NumberFormatException nfe) {
-                    Debug.logError("Error parsing message severity: " + nfe.getMessage(), module);
+                    Debug.logError("Error parsing message severity: " + nfe.getMessage(), MODULE);
                     severity = 9;
                 }
                 String message = "[" + UtilXml.childElementValue(messageElement, "Audience") + "] " + UtilXml
@@ -630,7 +630,7 @@ public class CCPaymentServices {
             try {
                 maxSev = Integer.parseInt(maxSevStr);
             } catch (NumberFormatException nfe) {
-                Debug.logError("Error parsing MaxSev: " + nfe.getMessage(), module);
+                Debug.logError("Error parsing MaxSev: " + nfe.getMessage(), MODULE);
                 maxSev = 9;
             }
         }
@@ -709,7 +709,7 @@ public class CCPaymentServices {
         Map<String, Object> pbOrder = UtilGenerics.cast(context.get("pbOrder"));
         if (pbOrder != null) {
             if (Debug.verboseOn()) {
-                Debug.logVerbose("pbOrder Map not empty:" + pbOrder.toString(), module);
+                Debug.logVerbose("pbOrder Map not empty:" + pbOrder.toString(), MODULE);
             }
             Element pbOrderElement = UtilXml.addChildElement(orderFormDocElement, "PbOrder", requestDocument); // periodic billing order
             UtilXml.addChildElementValue(pbOrderElement, "OrderFrequencyCycle", (String) pbOrder.get(
@@ -806,7 +806,7 @@ public class CCPaymentServices {
                 GenericValue countryGeo = address.getRelatedOne("CountryGeo", true);
                 UtilXml.addChildElementValue(addressElement, "Country", countryGeo.getString("geoSecCode"), document);
             } catch (GenericEntityException gee) {
-                Debug.logInfo(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, module);
+                Debug.logInfo(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, MODULE);
             }
         }
     }
@@ -897,7 +897,7 @@ public class CCPaymentServices {
             throw new ClearCommerceException("Missing server URL; check your ClearCommerce configuration");
         }
         if (Debug.verboseOn()) {
-            Debug.logVerbose("ClearCommerce server URL: " + serverURL, module);
+            Debug.logVerbose("ClearCommerce server URL: " + serverURL, MODULE);
         }
 
         OutputStream os = new ByteArrayOutputStream();
@@ -911,7 +911,7 @@ public class CCPaymentServices {
         String xmlString = os.toString();
 
         if (Debug.verboseOn()) {
-            Debug.logVerbose("ClearCommerce XML request string: " + xmlString, module);
+            Debug.logVerbose("ClearCommerce XML request string: " + xmlString, MODULE);
         }
 
         HttpClient http = new HttpClient(serverURL);
@@ -921,7 +921,7 @@ public class CCPaymentServices {
         try {
             response = http.post();
         } catch (HttpClientException hce) {
-            Debug.logInfo(hce, module);
+            Debug.logInfo(hce, MODULE);
             throw new ClearCommerceException("ClearCommerce connection problem", hce);
         }
 
@@ -932,10 +932,10 @@ public class CCPaymentServices {
             throw new ClearCommerceException("Error reading response Document from a String: " + e.getMessage());
         }
         if (Debug.verboseOn()) {
-            Debug.logVerbose("Result severity from clearCommerce:" + getMessageListMaxSev(responseDocument), module);
+            Debug.logVerbose("Result severity from clearCommerce:" + getMessageListMaxSev(responseDocument), MODULE);
         }
         if (Debug.verboseOn() && getMessageListMaxSev(responseDocument) > maxSevComp) {
-            Debug.logVerbose("Returned messages:" + getMessageList(responseDocument), module);
+            Debug.logVerbose("Returned messages:" + getMessageList(responseDocument), MODULE);
         }
         return responseDocument;
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java
index a67122f..1ee9ee9 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/clearcommerce/CCServicesTest.java
@@ -33,7 +33,7 @@ import junit.framework.TestCase;
 
 public class CCServicesTest extends OFBizTestCase {
 
-    public static final String module = CCServicesTest.class.getName();
+    public static final String MODULE = CCServicesTest.class.getName();
 
     // test data
     protected GenericValue emailAddr = null;
@@ -79,7 +79,7 @@ public class CCServicesTest extends OFBizTestCase {
      * Check the authorisation
      */
     public void testAuth() throws Exception {
-        Debug.logInfo("=====[testAuth] starting....", module);
+        Debug.logInfo("=====[testAuth] starting....", MODULE);
         try {
             Map<String, Object> serviceInput = UtilMisc.<String, Object>toMap("paymentConfig", configFile,
                     "billToEmail", emailAddr,
@@ -94,12 +94,12 @@ public class CCServicesTest extends OFBizTestCase {
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testCCAuth] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testCCAuth] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
             TestCase.assertNotNull("Service returned null for parameter authResult.", result.get("authResult"));
 
             if ((Boolean.TRUE).equals(result.get("authResult"))) { // returnCode ok?
-                Debug.logInfo("[testAuth] Error Messages from ClearCommerce:" + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testAuth] Error Messages from ClearCommerce:" + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             }
 
@@ -113,7 +113,7 @@ public class CCServicesTest extends OFBizTestCase {
      * Check the credit action: to deduct a certain amount of a credit card.
      */
     public void testCredit() throws Exception {
-        Debug.logInfo("=====[testCCredit] starting....", module);
+        Debug.logInfo("=====[testCCredit] starting....", MODULE);
         try {
             Map<String, Object> serviceMap = UtilMisc.<String, Object>toMap("paymentConfig", configFile,
                     "orderId", orderId,
@@ -126,12 +126,12 @@ public class CCServicesTest extends OFBizTestCase {
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testCCCredit] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testCCCredit] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
             TestCase.assertNotNull("Service returned null for parameter creditResult.", result.get("creditResult"));
 
             if ((Boolean.FALSE).equals(result.get("creditResult"))) { // returnCode ok?
-                Debug.logInfo("[testCCCredit] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testCCCredit] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             }
         } catch (GenericServiceException ex) {
@@ -144,7 +144,7 @@ public class CCServicesTest extends OFBizTestCase {
      * Test Purchase subscription
      */
     public void testPurchaseSubscription() throws Exception {
-        Debug.logInfo("=====[testPurchaseSubscription] starting....", module);
+        Debug.logInfo("=====[testPurchaseSubscription] starting....", MODULE);
         try {
             Map<String, Object> serviceMap = UtilMisc.<String, Object>toMap("paymentConfig", configFile,
                     "orderId", orderId,
@@ -160,12 +160,12 @@ public class CCServicesTest extends OFBizTestCase {
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testPurchaseDescription] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testPurchaseDescription] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage); // service completed ok?
             TestCase.assertNotNull("Service returned null for parameter creditResult.", result.get("creditResult"));
 
             if ((Boolean.FALSE).equals(result.get("creditResult"))) { // returnCode ok?
-                Debug.logInfo("[testPurchaseSubscription] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testPurchaseSubscription] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             }
         } catch (GenericServiceException ex) {
@@ -201,7 +201,7 @@ public class CCServicesTest extends OFBizTestCase {
      * Test Query subscription transaction status
      */
     public void testCCReport() throws Exception {
-        Debug.logInfo("=====[testReport] starting....", module);
+        Debug.logInfo("=====[testReport] starting....", MODULE);
         try {
 
             Map<String, Object> serviceMap = UtilMisc.<String, Object>toMap("orderId",
@@ -213,12 +213,12 @@ public class CCServicesTest extends OFBizTestCase {
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testPurchaseDescription] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testPurchaseDescription] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Reporting service", ModelService.RESPOND_SUCCESS, responseMessage); // service completed ok?
             TestCase.assertNotNull("Service returned null for parameter creditResult.", result.get("creditResult"));
 
             if ((Boolean.FALSE).equals(result.get("creditResult"))) { // returnCode ok?
-                Debug.logInfo("[testReport] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testReport] Error Messages from ClearCommerce: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             }
         } catch (GenericServiceException ex) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
index c5004e8..2402eed 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java
@@ -51,7 +51,7 @@ import com.cybersource.ws.client.FaultException;
  */
 public class IcsPaymentServices {
 
-    public static final String module = IcsPaymentServices.class.getName();
+    public static final String MODULE = IcsPaymentServices.class.getName();
     private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     public final static String resource = "AccountingUiLabels";
@@ -79,12 +79,12 @@ public class IcsPaymentServices {
         try {
             reply = UtilGenerics.cast(Client.runTransaction(request, props));
         } catch (FaultException e) {
-            Debug.logError(e, "ERROR: Fault from CyberSource", module);
-            Debug.logError(e, "Fault : " + e.getFaultString(), module);
+            Debug.logError(e, "ERROR: Fault from CyberSource", MODULE);
+            Debug.logError(e, "Fault : " + e.getFaultString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         } catch (ClientException e) {
-            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module);
+            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         }
@@ -126,11 +126,11 @@ public class IcsPaymentServices {
         try {
             reply = UtilGenerics.cast(Client.runTransaction(request, props));
         } catch (FaultException e) {
-            Debug.logError(e, "ERROR: Fault from CyberSource", module);
+            Debug.logError(e, "ERROR: Fault from CyberSource", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         } catch (ClientException e) {
-            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module);
+            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         }
@@ -165,11 +165,11 @@ public class IcsPaymentServices {
         try {
             reply = UtilGenerics.cast(Client.runTransaction(request, props));
         } catch (FaultException e) {
-            Debug.logError(e, "ERROR: Fault from CyberSource", module);
+            Debug.logError(e, "ERROR: Fault from CyberSource", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         } catch (ClientException e) {
-            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module);
+            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         }
@@ -204,11 +204,11 @@ public class IcsPaymentServices {
         try {
             reply = UtilGenerics.cast(Client.runTransaction(request, props));
         } catch (FaultException e) {
-            Debug.logError(e, "ERROR: Fault from CyberSource", module);
+            Debug.logError(e, "ERROR: Fault from CyberSource", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         } catch (ClientException e) {
-            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module);
+            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         }
@@ -237,11 +237,11 @@ public class IcsPaymentServices {
         try {
             reply = UtilGenerics.cast(Client.runTransaction(request, props));
         } catch (FaultException e) {
-            Debug.logError(e, "ERROR: Fault from CyberSource", module);
+            Debug.logError(e, "ERROR: Fault from CyberSource", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         } catch (ClientException e) {
-            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), module);
+            Debug.logError(e, "ERROR: CyberSource Client exception : " + e.getMessage(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingCyberSourceErrorCommunicateWithCyberSource", locale));
         }
@@ -269,11 +269,11 @@ public class IcsPaymentServices {
         String keysFile = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "keysFile", configString, "payment.cybersource.keysFile");
         // some property checking
         if (UtilValidate.isEmpty(merchantId)) {
-            Debug.logWarning("The merchantId property is not configured", module);
+            Debug.logWarning("The merchantId property is not configured", MODULE);
             return null;
         }
         if (UtilValidate.isEmpty(keysDir)) {
-            Debug.logWarning("The keysDir property is not configured", module);
+            Debug.logWarning("The keysDir property is not configured", MODULE);
             return null;
         }
         // create some properties for CS Client
@@ -289,7 +289,7 @@ public class IcsPaymentServices {
         if (UtilValidate.isNotEmpty(keysFile)) {
             props.put("alternateKeyFilename", keysFile);
         }
-        Debug.logInfo("Created CyberSource Properties : " + props, module);
+        Debug.logInfo("Created CyberSource Properties : " + props, MODULE);
         return props;
     }
 
@@ -402,7 +402,7 @@ public class IcsPaymentServices {
                 avsOverride = party.getDelegator().findOne("PartyIcsAvsOverride",
                         UtilMisc.toMap("partyId", party.getString("partyId")), false);
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (avsOverride != null && avsOverride.get("avsDeclineString") != null) {
                 String overrideString = avsOverride.getString("avsDeclineString");
@@ -424,7 +424,7 @@ public class IcsPaymentServices {
         if (email != null) {
             request.put("billTo_email", email.getString("infoString"));
         } else {
-            Debug.logWarning("Email not defined; Cybersource will fail.", module);
+            Debug.logWarning("Email not defined; Cybersource will fail.", MODULE);
         }
         // phone number seems to not be used; possibly only for reporting.
 
@@ -438,7 +438,7 @@ public class IcsPaymentServices {
             request.put("card_expirationMonth", expDateList.get(0));
             request.put("card_expirationYear", expDateList.get(1));
         } else {
-            Debug.logWarning("CreditCard not defined; Cybersource will fail.", module);
+            Debug.logWarning("CreditCard not defined; Cybersource will fail.", MODULE);
         }
         // CCV info
         String cvNum = (String) context.get("cardSecurityCode");
@@ -463,7 +463,7 @@ public class IcsPaymentServices {
                 request.put("billTo_state", billingAddress.getString("stateProvinceGeoId"));
             }
         } else {
-            Debug.logWarning("BillingAddress not defined; Cybersource will fail.", module);
+            Debug.logWarning("BillingAddress not defined; Cybersource will fail.", MODULE);
         }
         // order shipping information
         GenericValue shippingAddress = (GenericValue) context.get("shippingAddress");
@@ -571,7 +571,7 @@ public class IcsPaymentServices {
             result.put("captureMessage", reply.get("decision"));
         }
         if (Debug.infoOn())
-            Debug.logInfo("CC [Cybersource] authorization result : " + result, module);
+            Debug.logInfo("CC [Cybersource] authorization result : " + result, MODULE);
     }
 
     private static void processCaptureResult(Map<String, Object> reply, Map<String, Object> result) {
@@ -591,7 +591,7 @@ public class IcsPaymentServices {
         result.put("captureFlag", reply.get("ccCaptureReply_reasonCode"));
         result.put("captureMessage", reply.get("decision"));
         if (Debug.infoOn())
-            Debug.logInfo("CC [Cybersource] capture result : " + result, module);
+            Debug.logInfo("CC [Cybersource] capture result : " + result, MODULE);
     }
 
     private static void processReleaseResult(Map<String, Object> reply, Map<String, Object> result) {
@@ -611,7 +611,7 @@ public class IcsPaymentServices {
         result.put("releaseFlag", reply.get("reasonCode"));
         result.put("releaseMessage", reply.get("decision"));
         if (Debug.infoOn())
-            Debug.logInfo("CC [Cybersource] release result : " + result, module);
+            Debug.logInfo("CC [Cybersource] release result : " + result, MODULE);
     }
 
     private static void processRefundResult(Map<String, Object> reply, Map<String, Object> result) {
@@ -631,7 +631,7 @@ public class IcsPaymentServices {
         result.put("refundFlag", reply.get("ccCreditReply_reasonCode"));
         result.put("refundMessage", reply.get("decision"));
         if (Debug.infoOn())
-            Debug.logInfo("CC [Cybersource] refund result : " + result, module);
+            Debug.logInfo("CC [Cybersource] refund result : " + result, MODULE);
     }
 
     private static void processCreditResult(Map<String, Object> reply, Map<String, Object> result) {
@@ -653,15 +653,15 @@ public class IcsPaymentServices {
         result.put("creditFlag", reply.get("ccCreditReply_reasonCode"));
         result.put("creditMessage", reply.get("decision"));
         if (Debug.infoOn())
-            Debug.logInfo("CC [Cybersource] credit result : " + result, module);
+            Debug.logInfo("CC [Cybersource] credit result : " + result, MODULE);
     }
 
     private static String getDecision(Map<String, Object> reply) {
         String decision = (String) reply.get("decision");
         String reasonCode = (String) reply.get("reasonCode");
         if (!"ACCEPT".equalsIgnoreCase(decision)) {
-            Debug.logInfo("CyberSource : " + decision + " (" + reasonCode + ")", module);
-            Debug.logInfo("Reply Dump : " + reply, module);
+            Debug.logInfo("CyberSource : " + decision + " (" + reasonCode + ")", MODULE);
+            Debug.logInfo("Reply Dump : " + reply, MODULE);
         }
         return decision;
     }
@@ -679,7 +679,7 @@ public class IcsPaymentServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/EwayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/EwayServices.java
index f7da5fb..6123415 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/EwayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/EwayServices.java
@@ -37,7 +37,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class EwayServices {
 
-    public static final String module = EwayServices.class.getName();
+    public static final String MODULE = EwayServices.class.getName();
     public final static String resource = "AccountingUiLabels";
 
     // eway charge (auth w/ capture)
@@ -130,7 +130,7 @@ public class EwayServices {
         try {
             cc = delegator.getRelatedOne("CreditCard", paymentPref, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -195,7 +195,7 @@ public class EwayServices {
         try {
             cc = delegator.getRelatedOne("CreditCard", paymentPref, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -278,7 +278,7 @@ public class EwayServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, resParamName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayConnector.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayConnector.java
index e1c625a..c4a785a 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayConnector.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayConnector.java
@@ -34,7 +34,7 @@ import org.apache.ofbiz.base.util.Debug;
  */
 public class GatewayConnector {
 
-    private static final String module = GatewayConnector.class.getName();
+    private static final String MODULE = GatewayConnector.class.getName();
 
     private int timeout = 0;
 
@@ -107,7 +107,7 @@ public class GatewayConnector {
         } 
         catch (Exception e) {
             // re-throws exception so that the caller knows what went wrong
-            Debug.logError(e, e.getMessage(), module);
+            Debug.logError(e, e.getMessage(), MODULE);
             throw e;
         } finally {
             // close resources
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
index 14db26a..d1b1df9 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayRequest.java
@@ -33,7 +33,7 @@ import org.apache.ofbiz.base.util.Debug;
  */
 public class GatewayRequest {
 
-    private static final String module = GatewayRequest.class.getName();
+    private static final String MODULE = GatewayRequest.class.getName();
 
     // request urls
     public static final String REQUEST_URL_REFUND_TEST = "";
@@ -392,7 +392,7 @@ public class GatewayRequest {
 
         // log the request for test mode
         if (isTestMode()) {
-            Debug.logInfo("[eWay Request] : " + xml.toString(), module);
+            Debug.logInfo("[eWay Request] : " + xml.toString(), MODULE);
         }
 
         return xml.toString();
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
index f709eb6..5fcd9ef 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/eway/GatewayResponse.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Text;
  */
 public class GatewayResponse {
 
-    private static final String module = GatewayResponse.class.getName();
+    private static final String MODULE = GatewayResponse.class.getName();
 
     // private field definitions, values are set to default
 
@@ -197,7 +197,7 @@ public class GatewayResponse {
         }
             
         if (req.isTestMode()) {
-            Debug.logInfo("[eWay Reply]\n" + this.toString(), module);
+            Debug.logInfo("[eWay Reply]\n" + this.toString(), MODULE);
         }
     }
     
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
index 69ed209..b27aa80 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeApi.java
@@ -35,7 +35,7 @@ import org.xml.sax.SAXException;
 
 public class PcChargeApi {
 
-    public static final String module = PcChargeApi.class.getName();
+    public static final String MODULE = PcChargeApi.class.getName();
     public static final String xschema = "x-schema:..\\dtd\\stnd.xdr";
     public static final String rootElement = "XML_FILE";
     public static final String reqElement = "XML_REQUEST";
@@ -139,7 +139,7 @@ public class PcChargeApi {
         try {
             objString = (String) ObjectType.simpleTypeOrObjectConvert(value, "java.lang.String", null, null);
         } catch (GeneralException | ClassCastException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw new IllegalArgumentException("Unable to convert value to String");
         }
         if (objString == null && value != null) {
@@ -165,7 +165,7 @@ public class PcChargeApi {
         try {
             return UtilXml.writeXmlDocument(document);
         } catch (IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw new IllegalStateException("Unable to write document as String");
         }
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
index 4ccd7a5..b1642dd 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java
@@ -42,7 +42,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class PcChargeServices {
 
-    public static final String module = PcChargeServices.class.getName();
+    public static final String MODULE = PcChargeServices.class.getName();
     private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     public final static String resource = "AccountingUiLabels";
@@ -84,7 +84,7 @@ public class PcChargeServices {
         try {
             out = api.send();
         } catch (IOException | GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -162,7 +162,7 @@ public class PcChargeServices {
         try {
             out = api.send();
         } catch (IOException | GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -220,7 +220,7 @@ public class PcChargeServices {
         try {
             out = api.send();
         } catch (IOException | GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -272,7 +272,7 @@ public class PcChargeServices {
         try {
             out = api.send();
         } catch (IOException | GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -352,7 +352,7 @@ public class PcChargeServices {
 
     private static PcChargeApi getApi(Properties props) {
         if (props == null) {
-            Debug.logError("Cannot load API w/ null properties", module);
+            Debug.logError("Cannot load API w/ null properties", MODULE);
             return null;
         }
         String host = props.getProperty("host");
@@ -360,7 +360,7 @@ public class PcChargeServices {
         try {
             port = Integer.parseInt(props.getProperty("port"));
         } catch (RuntimeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         PcChargeApi api = null;
         if (port > 0 && host != null) {
@@ -390,15 +390,15 @@ public class PcChargeServices {
 
         // some property checking
         if (UtilValidate.isEmpty(processorId)) {
-            Debug.logWarning("The processorID property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The processorID property in [" + configString + "] is not configured", MODULE);
             return null;
         }
         if (UtilValidate.isEmpty(merchantId)) {
-            Debug.logWarning("The merchantID property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The merchantID property in [" + configString + "] is not configured", MODULE);
             return null;
         }
         if (UtilValidate.isEmpty(userId)) {
-            Debug.logWarning("The userID property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The userID property in [" + configString + "] is not configured", MODULE);
             return null;
         }
 
@@ -410,7 +410,7 @@ public class PcChargeServices {
         props.put("host", host);
         props.put("port", port);
         props.put("autoBill", autoBill);
-        Debug.logInfo("Returning properties - " + props, module);
+        Debug.logInfo("Returning properties - " + props, MODULE);
 
         return props;
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
index 44c129a..ca6d0ef 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java
@@ -30,7 +30,7 @@ import org.apache.ofbiz.base.util.ObjectType;
 
 public class RitaApi {
 
-    public static final String module = RitaApi.class.getName();
+    public static final String MODULE = RitaApi.class.getName();
     public static final String xschema = "x-schema:..\\dtd\\stnd.xdr";
     public static final String rootElement = "XML_FILE";
     public static final String reqElement = "XML_REQUEST";
@@ -123,7 +123,7 @@ public class RitaApi {
         try {
             objString = (String) ObjectType.simpleTypeOrObjectConvert(value, "java.lang.String", null, null);
         } catch (GeneralException | ClassCastException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw new IllegalArgumentException("Unable to convert value to String");
         }
         if (objString == null && value != null) {
@@ -170,7 +170,7 @@ public class RitaApi {
 
         if (mode == MODE_IN) {
             String stream = this.toString() + "..\r\n";
-            Debug.logInfo("Sending - \n" + stream, module);
+            Debug.logInfo("Sending - \n" + stream, MODULE);
             String urlString = "http://" + host + ":" + port;
             HttpClient http = new HttpClient(urlString);
             http.setDebug(true);
@@ -180,19 +180,19 @@ public class RitaApi {
             try {
                 resp = http.post(stream);
             } catch (HttpClientException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 throw new IOException(e.getMessage());
             }
 
             String[] lines = resp.split("\n");
             for (int i = 0; i < lines.length; i++) {
-                Debug.logInfo(lines[i], module);
+                Debug.logInfo(lines[i], MODULE);
                 if (!".".equals(lines[i].trim())) {
                     String[] lineSplit = lines[i].trim().split(" ", 2);
                     if (lineSplit != null && lineSplit.length == 2) {
                         docMap.put(lineSplit[0], lineSplit[1]);
                     } else {
-                        Debug.logWarning("Line split error - " + lines[i], module);
+                        Debug.logWarning("Line split error - " + lines[i], MODULE);
                     }
                 } else {
                     break;
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
index 76e1ccb..0b571bc 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java
@@ -47,7 +47,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class RitaServices {
 
-    public static final String module = RitaServices.class.getName();
+    public static final String MODULE = RitaServices.class.getName();
     private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     public final static String resource = "AccountingUiLabels";
@@ -85,10 +85,10 @@ public class RitaServices {
         // send the transaction
         RitaApi out = null;
         try {
-            Debug.logInfo("Sending request to RiTA", module);
+            Debug.logInfo("Sending request to RiTA", MODULE);
             out = api.send();
         } catch (GeneralException | IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -165,7 +165,7 @@ public class RitaServices {
         try {
             out = api.send();
         } catch (GeneralException | IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -233,7 +233,7 @@ public class RitaServices {
         try {
             out = api.send();
         } catch (GeneralException | IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -296,7 +296,7 @@ public class RitaServices {
         try {
             out = api.send();
         } catch (GeneralException | IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -325,7 +325,7 @@ public class RitaServices {
         try {
             orderHeader = orderPaymentPreference.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderPaymentPreference.getString("orderId")), locale));
         }
@@ -340,7 +340,7 @@ public class RitaServices {
                     terminalState = EntityQuery.use(delegator).from("PosTerminalState")
                             .where("posTerminalId", terminalId).filterByDate("openedDate", "closedDate").queryFirst();
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 }
 
                 // this is the current opened terminal
@@ -362,7 +362,7 @@ public class RitaServices {
                     refundResp = dispatcher.runSync("ritaCCCreditRefund", context);
                 }
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder,
                         "AccountingRitaErrorServiceException", locale));
             }
@@ -442,7 +442,7 @@ public class RitaServices {
 
     private static RitaApi getApi(Properties props) {
         if (props == null) {
-            Debug.logError("Cannot load API w/ null properties", module);
+            Debug.logError("Cannot load API w/ null properties", MODULE);
             return null;
         }
         String host = props.getProperty("host");
@@ -450,7 +450,7 @@ public class RitaServices {
         try {
             port = Integer.parseInt(props.getProperty("port"));
         } catch (RuntimeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         boolean ssl = "Y".equals(props.getProperty("ssl", "N")) ? true : false;
 
@@ -493,15 +493,15 @@ public class RitaServices {
 
         // some property checking
         if (UtilValidate.isEmpty(clientId)) {
-            Debug.logWarning("The clientID property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The clientID property in [" + configString + "] is not configured", MODULE);
             return null;
         }
         if (UtilValidate.isEmpty(userId)) {
-            Debug.logWarning("The userID property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The userID property in [" + configString + "] is not configured", MODULE);
             return null;
         }
         if (UtilValidate.isEmpty(userPw)) {
-            Debug.logWarning("The userPW property in [" + configString + "] is not configured", module);
+            Debug.logWarning("The userPW property in [" + configString + "] is not configured", MODULE);
             return null;
         }
 
@@ -515,7 +515,7 @@ public class RitaServices {
         props.put("ssl", ssl);
         props.put("autoBill", autoBill);
         props.put("forceTx", forceTx);
-        Debug.logInfo("Returning properties - " + props, module);
+        Debug.logInfo("Returning properties - " + props, MODULE);
 
         return props;
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
index 1a7e040..b805555 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java
@@ -51,7 +51,7 @@ import com.paymentech.orbital.sdk.util.exceptions.InitializationException;
 
 public class OrbitalPaymentServices {
 
-    public static String module = OrbitalPaymentServices.class.getName();
+    public static String MODULE = OrbitalPaymentServices.class.getName();
     private static int decimals = UtilNumber.getBigDecimalScale("invoice.decimals");
     private static RoundingMode rounding = UtilNumber.getRoundingMode("invoice.rounding");
     public final static String resource = "AccountingUiLabels";
@@ -72,7 +72,7 @@ public class OrbitalPaymentServices {
         try {
             request = new Request(RequestIF.NEW_ORDER_TRANSACTION);
         } catch (InitializationException e) {
-            Debug.logError(e, "Error in request initialization", module);
+            Debug.logError(e, "Error in request initialization", MODULE);
         }
         buildAuthOrAuthCaptureTransaction(context, delegator, props, request, results);
         Map<String, Object> validateResults = validateRequest(context, props, request);
@@ -98,7 +98,7 @@ public class OrbitalPaymentServices {
         try {
             request = new Request(RequestIF.NEW_ORDER_TRANSACTION);
         } catch (InitializationException e) {
-            Debug.logError(e, "Error in request initialization", module);
+            Debug.logError(e, "Error in request initialization", MODULE);
         }
         buildAuthOrAuthCaptureTransaction(context, delegator, props, request, results);
         Map<String, Object> validateResults = validateRequest(context, props, request);
@@ -125,7 +125,7 @@ public class OrbitalPaymentServices {
         try {
             creditCard = orderPaymentPreference.getRelatedOne("CreditCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -143,7 +143,7 @@ public class OrbitalPaymentServices {
         try {
             request = new Request(RequestIF.MARK_FOR_CAPTURE_TRANSACTION);
         } catch (InitializationException e) {
-            Debug.logError(e, "Error in request initialization", module);
+            Debug.logError(e, "Error in request initialization", MODULE);
         }
         buildCaptureTransaction(context, delegator, props, request, results);
         Map<String, Object> validateResults = validateRequest(context, props, request);
@@ -170,7 +170,7 @@ public class OrbitalPaymentServices {
         try {
             creditCard = orderPaymentPreference.getRelatedOne("CreditCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -187,7 +187,7 @@ public class OrbitalPaymentServices {
         try {
             request = new Request(RequestIF.NEW_ORDER_TRANSACTION);
         } catch (InitializationException e) {
-            Debug.logError(e, "Error in request initialization", module);
+            Debug.logError(e, "Error in request initialization", MODULE);
         }
         buildRefundTransaction(context, props, request, results);
         Map<String, Object> validateResults = validateRequest(context, props, request);
@@ -214,7 +214,7 @@ public class OrbitalPaymentServices {
         try {
             orderPaymentPreference.getRelatedOne("CreditCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPaymentUnableToGetCCInfo", locale));
         }
@@ -230,7 +230,7 @@ public class OrbitalPaymentServices {
         try {
             request = new Request(RequestIF.REVERSE_TRANSACTION);
         } catch (InitializationException e) {
-            Debug.logError(e, "Error in request initialization", module);
+            Debug.logError(e, "Error in request initialization", MODULE);
         }
         buildReleaseTransaction(context, delegator, props, request, results);
         Map<String, Object> validateResults = validateRequest(context, props, request);
@@ -273,7 +273,7 @@ public class OrbitalPaymentServices {
             buildConfiguratorContext.putAll(config.getConfigurations());
             config.setConfigurations(buildConfiguratorContext);
         } catch (InitializationException e) {
-            Debug.logError(e, "Orbital Configurator Initialization Error: " + e.getMessage(), module);
+            Debug.logError(e, "Orbital Configurator Initialization Error: " + e.getMessage(), MODULE);
         }
         return buildConfiguratorContext;
     }
@@ -291,7 +291,7 @@ public class OrbitalPaymentServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         return returnValue;
@@ -370,11 +370,11 @@ public class OrbitalPaymentServices {
             }
             results.put("processAmount", amount);
         } catch (InitializationException ie) {
-            Debug.logInfo("Unable to initialize request object", module);
+            Debug.logInfo("Unable to initialize request object", MODULE);
         } catch (FieldNotFoundException fnfe) {
-            Debug.logError("Unable to find XML field in template", module);
+            Debug.logError("Unable to find XML field in template", MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -409,11 +409,11 @@ public class OrbitalPaymentServices {
             Debug.logInfo("\nCapture Request:\n ======== " + request.getXML());
             results.put("captureAmount", amount);
         } catch (InitializationException ie) {
-            Debug.logInfo("Unable to initialize request object", module);
+            Debug.logInfo("Unable to initialize request object", MODULE);
         } catch (FieldNotFoundException fnfe) {
-            Debug.logError("Unable to find XML field in template" + fnfe.getMessage(), module);
+            Debug.logError("Unable to find XML field in template" + fnfe.getMessage(), MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -441,11 +441,11 @@ public class OrbitalPaymentServices {
             Debug.logInfo("\nRefund Request:\n ======== " + request.getXML());
             results.put("refundAmount", amount);
         } catch (InitializationException ie) {
-            Debug.logInfo("Unable to initialize request object", module);
+            Debug.logInfo("Unable to initialize request object", MODULE);
         } catch (FieldNotFoundException fnfe) {
-            Debug.logError("Unable to find XML field in template", module);
+            Debug.logError("Unable to find XML field in template", MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -465,11 +465,11 @@ public class OrbitalPaymentServices {
             Debug.logInfo("\nRelease Request:\n ======== " + request.getXML());
             results.put("releaseAmount", amount);
         } catch (InitializationException ie) {
-            Debug.logInfo("Unable to initialize request object", module);
+            Debug.logInfo("Unable to initialize request object", MODULE);
         } catch (FieldNotFoundException fnfe) {
-            Debug.logError("Unable to find XML field in template" + fnfe.getMessage(), module);
+            Debug.logError("Unable to find XML field in template" + fnfe.getMessage(), MODULE);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
     }
 
@@ -481,7 +481,7 @@ public class OrbitalPaymentServices {
         try {
             tp = new TransactionProcessor();
         } catch (InitializationException iex) {
-            Debug.logError("TransactionProcessor failed to initialize" + iex.getMessage(), module);
+            Debug.logError("TransactionProcessor failed to initialize" + iex.getMessage(), MODULE);
             iex.printStackTrace();
         }
     }
@@ -497,7 +497,7 @@ public class OrbitalPaymentServices {
             }
             processCardResult.put("processCardResponse", response);
         } catch (TransactionException tex) {
-            Debug.logError("TransactionProcessor failed to initialize" + tex.getMessage(), module);
+            Debug.logError("TransactionProcessor failed to initialize" + tex.getMessage(), MODULE);
             tex.printStackTrace();
         }
         processCardResult.put(ModelService.RESPONSE_MESSAGE, ModelService.RESPOND_SUCCESS);
@@ -521,7 +521,7 @@ public class OrbitalPaymentServices {
             results.put("processAmount", BigDecimal.ZERO);
             results.put("authRefNum", OrbitalPaymentServices.ERROR);
         }
-        Debug.logInfo("processAuthTransResult: " + results.toString(),module);
+        Debug.logInfo("processAuthTransResult: " + results.toString(),MODULE);
     }
 
     private static void processAuthCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) {
@@ -545,7 +545,7 @@ public class OrbitalPaymentServices {
             results.put("processAmount", BigDecimal.ZERO);
             results.put("authRefNum", OrbitalPaymentServices.ERROR);
         }
-        Debug.logInfo("processAuthCaptureTransResult: " + results.toString(),module);
+        Debug.logInfo("processAuthCaptureTransResult: " + results.toString(),MODULE);
     }
 
     private static void processCaptureTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) {
@@ -561,7 +561,7 @@ public class OrbitalPaymentServices {
         } else {
             results.put("captureAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("processCaptureTransResult: " + results.toString(),module);
+        Debug.logInfo("processCaptureTransResult: " + results.toString(),MODULE);
     }
 
     private static void processRefundTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) {
@@ -577,7 +577,7 @@ public class OrbitalPaymentServices {
         } else {
             results.put("refundAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("processRefundTransResult: " + results.toString(),module);
+        Debug.logInfo("processRefundTransResult: " + results.toString(),MODULE);
     }
 
     private static void processReleaseTransResult(Map<String, Object> processCardResponseContext, Map<String, Object> results) {
@@ -593,7 +593,7 @@ public class OrbitalPaymentServices {
         } else {
             results.put("releaseAmount", BigDecimal.ZERO);
         }
-        Debug.logInfo("processReleaseTransResult: " + results.toString(),module);
+        Debug.logInfo("processReleaseTransResult: " + results.toString(),MODULE);
     }
 
     private static void printTransResult(ResponseIF response) {
@@ -611,7 +611,7 @@ public class OrbitalPaymentServices {
         generatedResponse.put("AVSCode",  response.getAVSResponseCode());
         generatedResponse.put("CVV2ResponseCode", response.getCVV2RespCode());
 
-        Debug.logInfo("printTransResult === " + generatedResponse.toString(),module);
+        Debug.logInfo("printTransResult === " + generatedResponse.toString(),MODULE);
     }
 
     private static String formatExpDateForOrbital(String expDate) {
@@ -634,8 +634,8 @@ public class OrbitalPaymentServices {
                 shippingRef = "No Tracking Info processed in order";
             }
         } catch (GenericEntityException e) {
-            Debug.logError("Shipping Ref not found returning empty string", module);
-            Debug.logError(e, module);
+            Debug.logError("Shipping Ref not found returning empty string", MODULE);
+            Debug.logError(e, MODULE);
         }
         return shippingRef;
     }
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
index dd07bb5..cd91b1b 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalEvents.java
@@ -64,7 +64,7 @@ public class PayPalEvents {
     public static final String resource = "AccountingUiLabels";
     public static final String resourceErr = "AccountingErrorUiLabels";
     public static final String commonResource = "CommonUiLabels";
-    public static final String module = PayPalEvents.class.getName();
+    public static final String MODULE = PayPalEvents.class.getName();
 
     /** Initiate PayPal Request */
     public static String callPayPal(HttpServletRequest request, HttpServletResponse response) {
@@ -80,7 +80,7 @@ public class PayPalEvents {
         try {
             orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get the order header for order: " + orderId, module);
+            Debug.logError(e, "Cannot get the order header for order: " + orderId, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingOrderHeader", locale));
             return "error";
         }
@@ -93,7 +93,7 @@ public class PayPalEvents {
         GenericValue productStore = ProductStoreWorker.getProductStore(request);
 
         if (productStore == null) {
-            Debug.logError("ProductStore is null", module);
+            Debug.logError("ProductStore is null", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingMerchantConfiguration", locale));
             return "error";
         }
@@ -142,7 +142,7 @@ public class PayPalEvents {
             || UtilValidate.isEmpty(returnUrl)
             || UtilValidate.isEmpty(imageUrl)
             || UtilValidate.isEmpty(payPalAccount)) {
-            Debug.logError("Payment properties is not configured properly, some notify URL from PayPal is not correctly defined!", module);
+            Debug.logError("Payment properties is not configured properly, some notify URL from PayPal is not correctly defined!", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingMerchantConfiguration", locale));
             return "error";
         }
@@ -174,7 +174,7 @@ public class PayPalEvents {
         try {
             response.sendRedirect(redirectString);
         } catch (IOException e) {
-            Debug.logError(e, "Problems redirecting to PayPal", module);
+            Debug.logError(e, "Problems redirecting to PayPal", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsConnectingWithPayPal", locale));
             return "error";
         }
@@ -192,7 +192,7 @@ public class PayPalEvents {
         // get the product store
         GenericValue productStore = ProductStoreWorker.getProductStore(request);
         if (productStore == null) {
-            Debug.logError("ProductStore is null", module);
+            Debug.logError("ProductStore is null", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingMerchantConfiguration", locale));
             return "error";
         }
@@ -218,7 +218,7 @@ public class PayPalEvents {
         String redirectUrl = getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "redirectUrl", configString, "payment.paypal.redirect");
 
         if (UtilValidate.isEmpty(confirmUrl) || UtilValidate.isEmpty(redirectUrl)) {
-            Debug.logError("Payment properties is not configured properly, no confirm URL defined!", module);
+            Debug.logError("Payment properties is not configured properly, no confirm URL defined!", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingMerchantConfiguration", locale));
             return "error";
         }
@@ -240,23 +240,23 @@ public class PayPalEvents {
 
             pw.println(str);
             confirmResp = in.readLine();
-            Debug.logError("PayPal Verification Response: " + confirmResp, module);
+            Debug.logError("PayPal Verification Response: " + confirmResp, MODULE);
         } catch (IOException e) {
-            Debug.logError(e, "Problems sending verification message.", module);
+            Debug.logError(e, "Problems sending verification message.", MODULE);
         }
 
-        Debug.logInfo("Got verification from PayPal, processing..", module);
+        Debug.logInfo("Got verification from PayPal, processing..", MODULE);
         boolean verified = false;
         for (String name : parametersMap.keySet()) {
             String value = request.getParameter(name);
-            Debug.logError("### Param: " + name + " => " + value, module);
+            Debug.logError("### Param: " + name + " => " + value, MODULE);
             if (UtilValidate.isNotEmpty(name) && "payer_status".equalsIgnoreCase(name) &&
                 UtilValidate.isNotEmpty(value) && "verified".equalsIgnoreCase(value)) {
                 verified = true;
             }
         }
         if (!verified) {
-            Debug.logError("###### PayPal did not verify this request, need investigation!", module);
+            Debug.logError("###### PayPal did not verify this request, need investigation!", MODULE);
         }
 
         // get the system user
@@ -264,7 +264,7 @@ public class PayPalEvents {
         try {
             userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get UserLogin for: system; cannot continue", module);
+            Debug.logError(e, "Cannot get UserLogin for: system; cannot continue", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingAuthenticationUser", locale));
             return "error";
         }
@@ -278,18 +278,18 @@ public class PayPalEvents {
             try {
                 orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Cannot get the order header for order: " + orderId, module);
+                Debug.logError(e, "Cannot get the order header for order: " + orderId, MODULE);
                 request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingOrderHeader", locale));
                 return "error";
             }
         } else {
-            Debug.logError("PayPal did not callback with a valid orderId!", module);
+            Debug.logError("PayPal did not callback with a valid orderId!", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.noValidOrderIdReturned", locale));
             return "error";
         }
 
         if (orderHeader == null) {
-            Debug.logError("Cannot get the order header for order: " + orderId, module);
+            Debug.logError("Cannot get the order header for order: " + orderId, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.problemsGettingOrderHeader", locale));
             return "error";
         }
@@ -315,24 +315,24 @@ public class PayPalEvents {
             }
         } catch (Exception e) {
             String errMsg = "Error handling PayPal notification";
-            Debug.logError(e, errMsg, module);
+            Debug.logError(e, errMsg, MODULE);
             try {
                 TransactionUtil.rollback(beganTransaction, errMsg, e);
             } catch (GenericTransactionException gte2) {
-                Debug.logError(gte2, "Unable to rollback transaction", module);
+                Debug.logError(gte2, "Unable to rollback transaction", MODULE);
             }
         } finally {
             if (!okay) {
                 try {
                     TransactionUtil.rollback(beganTransaction, "Failure in processing PayPal callback", null);
                 } catch (GenericTransactionException gte) {
-                    Debug.logError(gte, "Unable to rollback transaction", module);
+                    Debug.logError(gte, "Unable to rollback transaction", MODULE);
                 }
             } else {
                 try {
                     TransactionUtil.commit(beganTransaction);
                 } catch (GenericTransactionException gte) {
-                    Debug.logError(gte, "Unable to commit transaction", module);
+                    Debug.logError(gte, "Unable to commit transaction", MODULE);
                 }
             }
         }
@@ -344,7 +344,7 @@ public class PayPalEvents {
             try {
                 dispatcher.runSync("sendOrderConfirmation", emailContext);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problems sending email confirmation", module);
+                Debug.logError(e, "Problems sending email confirmation", MODULE);
             }
         }
 
@@ -365,7 +365,7 @@ public class PayPalEvents {
         try {
             beganTransaction = TransactionUtil.begin();
         } catch (GenericTransactionException gte) {
-            Debug.logError(gte, "Unable to begin transaction", module);
+            Debug.logError(gte, "Unable to begin transaction", MODULE);
         }
 
         // cancel the order
@@ -375,13 +375,13 @@ public class PayPalEvents {
             try {
                 TransactionUtil.commit(beganTransaction);
             } catch (GenericTransactionException gte) {
-                Debug.logError(gte, "Unable to commit transaction", module);
+                Debug.logError(gte, "Unable to commit transaction", MODULE);
             }
         } else {
             try {
                 TransactionUtil.rollback(beganTransaction, "Failure in processing PayPal cancel callback", null);
             } catch (GenericTransactionException gte) {
-                Debug.logError(gte, "Unable to rollback transaction", module);
+                Debug.logError(gte, "Unable to rollback transaction", MODULE);
             }
         }
 
@@ -390,12 +390,12 @@ public class PayPalEvents {
     }
 
     private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
-        Debug.logVerbose("Setting payment prefrences..", module);
+        Debug.logVerbose("Setting payment prefrences..", MODULE);
         List <GenericValue> paymentPrefs = null;
         try {
             paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference").where("orderId", orderId, "statusId", "PAYMENT_NOT_RECEIVED").queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get payment preferences for order #" + orderId, module);
+            Debug.logError(e, "Cannot get payment preferences for order #" + orderId, MODULE);
             return false;
         }
         if (paymentPrefs.size() > 0) {
@@ -425,10 +425,10 @@ public class PayPalEvents {
         try {
             authDate = new java.sql.Timestamp(sdf.parse(paymentDate).getTime());
         } catch (ParseException e) {
-            Debug.logError(e, "Cannot parse date string: " + paymentDate, module);
+            Debug.logError(e, "Cannot parse date string: " + paymentDate, MODULE);
             authDate = UtilDateTime.nowTimestamp();
         } catch (NullPointerException e) {
-            Debug.logError(e, "Cannot parse date string: " + paymentDate, module);
+            Debug.logError(e, "Cannot parse date string: " + paymentDate, MODULE);
             authDate = UtilDateTime.nowTimestamp();
         }
 
@@ -466,7 +466,7 @@ public class PayPalEvents {
         try {
             delegator.storeAll(toStore);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot set payment preference/payment info", module);
+            Debug.logError(e, "Cannot set payment preference/payment info", MODULE);
             return false;
         }
 
@@ -477,13 +477,13 @@ public class PayPalEvents {
             results = dispatcher.runSync("createPaymentFromPreference", UtilMisc.toMap("userLogin", userLogin,
                     "orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"), "comments", comment));
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Failed to execute service createPaymentFromPreference", module);
+            Debug.logError(e, "Failed to execute service createPaymentFromPreference", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "payPalEvents.failedToExecuteServiceCreatePaymentFromPreference", locale));
             return false;
         }
 
         if (ServiceUtil.isError(results)) {
-            Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), module);
+            Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), MODULE);
             request.setAttribute("_ERROR_MESSAGE_", results.get(ModelService.ERROR_MESSAGE));
             return false;
         }
@@ -504,7 +504,7 @@ public class PayPalEvents {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
index 7f9aa00..dd8d3fe 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
@@ -82,7 +82,7 @@ import com.paypal.sdk.services.NVPCallerServices;
  */
 public class PayPalServices {
 
-    public static final String module = PayPalServices.class.getName();
+    public static final String MODULE = PayPalServices.class.getName();
     public final static String resource = "AccountingErrorUiLabels";
     
     // Used to maintain a weak reference to the ShoppingCart for customers who have gone to PayPal to checkout
@@ -139,7 +139,7 @@ public class PayPalServices {
         try {
             addCartDetails(encoder, cart);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPayPalErrorDuringRetrievingCartDetails", locale));
         }
@@ -148,7 +148,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -185,7 +185,7 @@ public class PayPalServices {
             cart = weakCart.get();
         }
         if (cart == null) {
-            Debug.logError("Could locate the ShoppingCart for token " + token, module);
+            Debug.logError("Could locate the ShoppingCart for token " + token, MODULE);
             return ServiceUtil.returnSuccess();
         }
         // Since most if not all of the shipping estimate codes requires a persisted contactMechId we'll create one and
@@ -208,7 +208,7 @@ public class PayPalServices {
             GenericValue userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", "system").cache().queryOne();
             inMap.put("userLogin", userLogin);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         boolean beganTransaction = false;
         Transaction parentTransaction = null;
@@ -216,20 +216,20 @@ public class PayPalServices {
             parentTransaction = TransactionUtil.suspend();
             beganTransaction = TransactionUtil.begin();
         } catch (GenericTransactionException e1) {
-            Debug.logError(e1, module);
+            Debug.logError(e1, MODULE);
         }
         try {
             Map<String, Object> outMap = dispatcher.runSync("createPostalAddress", inMap);
             contactMechId = (String) outMap.get("contactMechId");
         } catch (GenericServiceException e) {
-            Debug.logError(e.getMessage(), module);
+            Debug.logError(e.getMessage(), MODULE);
             return ServiceUtil.returnSuccess();
         }
         try {
             TransactionUtil.commit(beganTransaction);
             if (parentTransaction != null) TransactionUtil.resume(parentTransaction);
         } catch (GenericTransactionException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         // clone the cart so we can modify it temporarily
         CheckOutHelper coh = new CheckOutHelper(dispatcher, delegator, cart);
@@ -251,7 +251,7 @@ public class PayPalServices {
             try {
                 coh.calcAndAddTax();
             } catch (GeneralException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 continue;
             }
             String estimateLabel = shipMethod.getString("partyId") + " - " + shipMethod.getString("description");
@@ -266,19 +266,19 @@ public class PayPalServices {
         try {
             responseMsg = encoder.encode();
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (responseMsg != null) {
             try {
                 response.setContentLength(responseMsg.getBytes("UTF-8").length);
             } catch (UnsupportedEncodingException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
 
             try (Writer writer = response.getWriter()) {
                 writer.write(responseMsg);
             } catch (IOException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
 
@@ -289,7 +289,7 @@ public class PayPalServices {
             GenericValue contactMech = EntityQuery.use(delegator).from("ContactMech").where("contactMechId", contactMechId).queryOne();
             contactMech.remove();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         coh.setCheckOutShippingAddress(oldShipAddress);
         return ServiceUtil.returnSuccess();
@@ -371,7 +371,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -385,11 +385,11 @@ public class PayPalServices {
                 try {
                     cart.setUserLogin(userLogin, dispatcher);
                 } catch (CartItemModifyException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(e.getMessage());
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -406,7 +406,7 @@ public class PayPalServices {
             try {
                 party = EntityQuery.use(delegator).from("Party").where("partyId", partyId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (party == null) {
                 partyId = null;
@@ -436,7 +436,7 @@ public class PayPalServices {
                 inMap.put("roleTypeId", "CUSTOMER");
                 dispatcher.runSync("createPartyRole", inMap);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -466,7 +466,7 @@ public class PayPalServices {
                     if (primaryEmails > 0) emailContactPurposeTypeId = "BILLING_EMAIL";
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         if (emailContactMechId == null) {
@@ -482,7 +482,7 @@ public class PayPalServices {
                 outMap = dispatcher.runSync("createPartyEmailAddress", inMap);
                 emailContactMechId = (String) outMap.get("contactMechId");
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -512,7 +512,7 @@ public class PayPalServices {
                 phoneContactId = (String) outMap.get("contactMechId");
                 cart.addContactMech("PHONE_BILLING", phoneContactId);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         // Create a new Postal Address if necessary
@@ -553,7 +553,7 @@ public class PayPalServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         if (postalContactId == null) {
@@ -563,7 +563,7 @@ public class PayPalServices {
                 outMap = dispatcher.runSync("createPartyPostalAddress", postalMap);
                 postalContactId = (String) outMap.get("contactMechId");
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(e.getMessage());
             }
         }
@@ -583,7 +583,7 @@ public class PayPalServices {
                 }
             } catch (GenericServiceException e) {
                 // Not the end of the world, we'll carry on
-                Debug.logInfo(e.getMessage(), module);
+                Debug.logInfo(e.getMessage(), MODULE);
             }
         }
 
@@ -607,7 +607,7 @@ public class PayPalServices {
                         .queryFirst();
                 cart.setAllShipmentMethodTypeId(shipmentMethod.getString("shipmentMethodTypeId"));
             } catch (GenericEntityException e1) {
-                Debug.logError(e1, module);
+                Debug.logError(e1, MODULE);
             }
         }
         //Get rid of any excess ship groups
@@ -634,7 +634,7 @@ public class PayPalServices {
         try {
             cho.calcAndAddTax();
         } catch (GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -651,7 +651,7 @@ public class PayPalServices {
         try {
             outMap = dispatcher.runSync("createPayPalPaymentMethod", inMap);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         String paymentMethodId = (String) outMap.get("paymentMethodId");
@@ -681,7 +681,7 @@ public class PayPalServices {
             payPalPaymentMethod = paymentPref.getRelatedOne("PaymentMethod", false);
             payPalPaymentMethod = payPalPaymentMethod.getRelatedOne("PayPalPaymentMethod", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         BigDecimal processAmount = paymentPref.getBigDecimal("maxAmount");
@@ -706,7 +706,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalPaymentSetting, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (decoder == null) {
@@ -737,11 +737,11 @@ public class PayPalServices {
         try {
             outMap = dispatcher.runSync("updatePayPalPaymentMethod", inMap);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(outMap)) {
-            Debug.logError(ServiceUtil.getErrorMessage(outMap), module);
+            Debug.logError(ServiceUtil.getErrorMessage(outMap), MODULE);
             return outMap;
         }
         return ServiceUtil.returnSuccess();
@@ -771,7 +771,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -824,7 +824,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -872,7 +872,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -926,7 +926,7 @@ public class PayPalServices {
         try {
             decoder = sendNVPRequest(payPalConfig, encoder);
         } catch (PayPalException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
 
@@ -985,7 +985,7 @@ public class PayPalServices {
             try {
                 payPalGatewayConfig = EntityQuery.use(delegator).from("PaymentGatewayPayPal").where("paymentGatewayConfigId", paymentGatewayConfigId).cache().queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         return payPalGatewayConfig;
@@ -1001,7 +1001,7 @@ public class PayPalServices {
             profile.setEnvironment(payPalConfig.getString("apiEnvironment"));
             caller.setAPIProfile(profile);
         } catch (PayPalException e) {
-            Debug.logError(e.getMessage(), module);
+            Debug.logError(e.getMessage(), MODULE);
         }
 
         String requestMessage = encoder.encode();
@@ -1010,7 +1010,7 @@ public class PayPalServices {
         NVPDecoder decoder = new NVPDecoder();
         decoder.decode(responseMessage);
         if (!"Success".equals(decoder.get("ACK"))) {
-            Debug.logError("A response other than success was received from PayPal: " + responseMessage, module);
+            Debug.logError("A response other than success was received from PayPal: " + responseMessage, MODULE);
         }
 
         return decoder;
@@ -1025,7 +1025,7 @@ public class PayPalServices {
                 geoId = countryGeo.getString("geoId");
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         return geoId;
     }
@@ -1048,7 +1048,7 @@ public class PayPalServices {
             geoAssocAndGeoTo = EntityQuery.use(delegator).from("GeoAssocAndGeoTo").where(cond).cache().queryFirst();
             
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (geoAssocAndGeoTo != null) {
             return geoAssocAndGeoTo.getString("geoId");
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
index 21b7cb8..6aa1c48 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayPaymentServices.java
@@ -44,12 +44,12 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class SagePayPaymentServices {
 
-    public static final String module = SagePayPaymentServices.class.getName();
+    public static final String MODULE = SagePayPaymentServices.class.getName();
     public final static String resource = "AccountingUiLabels";
 
     private static Map<String, String> buildCustomerBillingInfo(Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered buildCustomerBillingInfo", module);
-        Debug.logInfo("SagePay buildCustomerBillingInfo context : " + context, module);
+        Debug.logInfo("SagePay - Entered buildCustomerBillingInfo", MODULE);
+        Debug.logInfo("SagePay buildCustomerBillingInfo context : " + context, MODULE);
 
         Map<String, String> billingInfo = new HashMap<>();
 
@@ -121,11 +121,11 @@ public class SagePayPaymentServices {
                     currency = (String) context.get("currency");
 
                 } else {
-                    Debug.logWarning("Payment preference " + opp + " is not a credit card", module);
+                    Debug.logWarning("Payment preference " + opp + " is not a credit card", MODULE);
                 }
             }
         } catch (GenericEntityException ex) {
-            Debug.logError("Cannot build customer information for " + context + " due to error: " + ex.getMessage(), module);
+            Debug.logError("Cannot build customer information for " + context + " due to error: " + ex.getMessage(), MODULE);
             return null;
         }
 
@@ -145,15 +145,15 @@ public class SagePayPaymentServices {
         billingInfo.put("billingPostCode", postalCode);
         billingInfo.put("billingAddress", address);
 
-        Debug.logInfo("SagePay billingInfo : " + billingInfo, module);
-        Debug.logInfo("SagePay - Exiting buildCustomerBillingInfo", module);
+        Debug.logInfo("SagePay billingInfo : " + billingInfo, MODULE);
+        Debug.logInfo("SagePay - Exiting buildCustomerBillingInfo", MODULE);
 
         return billingInfo;
     }
 
     public static Map<String, Object> ccAuth(DispatchContext dctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered ccAuth", module);
-        Debug.logInfo("SagePay ccAuth context : " + context, module);
+        Debug.logInfo("SagePay - Entered ccAuth", MODULE);
+        Debug.logInfo("SagePay ccAuth context : " + context, MODULE);
         Map<String, Object> response = null;
         String orderId = (String) context.get("orderId");
         Locale locale = (Locale) context.get("locale");
@@ -164,8 +164,8 @@ public class SagePayPaymentServices {
         } else {
             response = processCardAuthorisationPayment(dctx, context);
         }
-        Debug.logInfo("SagePay ccAuth response : " + response, module);
-        Debug.logInfo("SagePay - Exiting ccAuth", module);
+        Debug.logInfo("SagePay ccAuth response : " + response, MODULE);
+        Debug.logInfo("SagePay - Exiting ccAuth", MODULE);
         return response;
     }
 
@@ -196,7 +196,7 @@ public class SagePayPaymentServices {
                         )
                     );
 
-            Debug.logInfo("SagePay - SagePayPaymentAuthentication result : " + paymentResult, module);
+            Debug.logInfo("SagePay - SagePayPaymentAuthentication result : " + paymentResult, MODULE);
 
             String transactionType = (String) paymentResult.get("transactionType");
             String status = (String) paymentResult.get("status");
@@ -208,45 +208,45 @@ public class SagePayPaymentServices {
             String amount = (String) paymentResult.get("amount");
 
             if (status != null && "OK".equals(status)) {
-                Debug.logInfo("SagePay - Payment authorized for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Payment authorized for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.TRUE, txAuthNo, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail);
                 if ("PAYMENT".equals(transactionType)) {
                     Map<String,Object> captureResult = SagePayUtil.buildCardCapturePaymentResponse(Boolean.TRUE, txAuthNo, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail);
                     result.putAll(captureResult);
                 }
             } else if (status != null && "INVALID".equals(status)) {
-                Debug.logInfo("SagePay - Invalid authorisation request for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Invalid authorisation request for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.FALSE, null, null, BigDecimal.ZERO, "INVALID", vendorTxCode, statusDetail);
             } else if (status != null && "MALFORMED".equals(status)) {
-                Debug.logInfo("SagePay - Malformed authorisation request for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Malformed authorisation request for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.FALSE, null, null, BigDecimal.ZERO, "MALFORMED", vendorTxCode, statusDetail);
             } else if (status != null && "NOTAUTHED".equals(status)) {
-                Debug.logInfo("SagePay - NotAuthed authorisation request for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - NotAuthed authorisation request for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.FALSE, null, securityKey, BigDecimal.ZERO, vpsTxId, vendorTxCode, statusDetail);
             } else if (status != null && "REJECTED".equals(status)) {
-                Debug.logInfo("SagePay - Rejected authorisation request for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Rejected authorisation request for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.FALSE, null, securityKey, new BigDecimal(amount), vpsTxId, vendorTxCode, statusDetail);
             } else {
-                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardAuthorisationPaymentResponse(Boolean.FALSE, null, null, BigDecimal.ZERO, "ERROR", vendorTxCode, statusDetail);
             }
         } catch(GenericServiceException e) {
-            Debug.logError(e, "Error in calling SagePayPaymentAuthentication", module);
+            Debug.logError(e, "Error in calling SagePayPaymentAuthentication", MODULE);
             result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayPaymentAuthorisationException", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
         return result;
     }
 
     public static Map<String, Object> ccCapture(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered ccCapture", module);
-        Debug.logInfo("SagePay ccCapture context : " + context, module);
+        Debug.logInfo("SagePay - Entered ccCapture", MODULE);
+        Debug.logInfo("SagePay ccCapture context : " + context, MODULE);
         GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
         GenericValue authTransaction = PaymentGatewayServices.getAuthTransaction(orderPaymentPreference);
         context.put("authTransaction", authTransaction);
         Map<String, Object> response = processCardCapturePayment(ctx, context);
 
-        Debug.logInfo("SagePay ccCapture response : " + response, module);
-        Debug.logInfo("SagePay - Exiting ccCapture", module);
+        Debug.logInfo("SagePay ccCapture response : " + response, MODULE);
+        Debug.logInfo("SagePay - Exiting ccCapture", MODULE);
 
         return response;
     }
@@ -275,38 +275,38 @@ public class SagePayPaymentServices {
                             "amount", amount.toString()
                         )
                     );
-            Debug.logInfo("SagePay - SagePayPaymentAuthorisation result : " + paymentResult, module);
+            Debug.logInfo("SagePay - SagePayPaymentAuthorisation result : " + paymentResult, MODULE);
             String status = (String) paymentResult.get("status");
             String statusDetail = (String) paymentResult.get("statusDetail");
             if (status != null && "OK".equals(status)) {
-                Debug.logInfo("SagePay Payment Released for Order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay Payment Released for Order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardCapturePaymentResponse(Boolean.TRUE, txAuthCode, securityKey, amount, vpsTxId, vendorTxCode, statusDetail);
             } else {
-                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + vendorTxCode, module);
+                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + vendorTxCode, MODULE);
                 result = SagePayUtil.buildCardCapturePaymentResponse(Boolean.FALSE, txAuthCode, securityKey, amount, vpsTxId, vendorTxCode, statusDetail);
             }
         } catch(GenericServiceException e) {
-            Debug.logError(e, "Error in calling SagePayPaymentAuthorisation", module);
+            Debug.logError(e, "Error in calling SagePayPaymentAuthorisation", MODULE);
             result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayPaymentAuthorisationException", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
         return result;
     }
 
     public static Map<String, Object> ccRefund(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered ccRefund", module);
-        Debug.logInfo("SagePay ccRefund context : " + context, module);
+        Debug.logInfo("SagePay - Entered ccRefund", MODULE);
+        Debug.logInfo("SagePay ccRefund context : " + context, MODULE);
         Locale locale = (Locale) context.get("locale");
         GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
         GenericValue captureTransaction = PaymentGatewayServices.getCaptureTransaction(orderPaymentPreference);
         if (captureTransaction == null) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentTransactionAuthorizationNotFoundCannotRefund", locale));
         }
-        Debug.logInfo("SagePay ccRefund captureTransaction : " + captureTransaction, module);
+        Debug.logInfo("SagePay ccRefund captureTransaction : " + captureTransaction, MODULE);
         GenericValue creditCard = null;
         try {
             creditCard = orderPaymentPreference.getRelatedOne("CreditCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Error getting CreditCard for OrderPaymentPreference : " + orderPaymentPreference, module);
+            Debug.logError(e, "Error getting CreditCard for OrderPaymentPreference : " + orderPaymentPreference, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingPaymentUnableToGetCCInfo", locale) + " " + orderPaymentPreference);
         }
         context.put("creditCard",creditCard);
@@ -334,7 +334,7 @@ public class SagePayPaymentServices {
         Map<String, Object> response = null;
 
         if (authCal.before(yesterday)) {
-            Debug.logInfo("SagePay - Calling Refund for Refund", module);
+            Debug.logInfo("SagePay - Calling Refund for Refund", MODULE);
             response = processCardRefundPayment(ctx, context);
         } else {
 
@@ -342,15 +342,15 @@ public class SagePayPaymentServices {
             cal.set(nowCal.get(Calendar.YEAR), nowCal.get(Calendar.MONTH), nowCal.get(Calendar.DATE), 23, 49, 59);
 
             if (authCal.before(cal)) {
-                Debug.logInfo("SagePay - Calling Void for Refund", module);
+                Debug.logInfo("SagePay - Calling Void for Refund", MODULE);
                 response = processCardVoidPayment(ctx, context);
             } else {
-                Debug.logInfo("SagePay - Calling Refund for Refund", module);
+                Debug.logInfo("SagePay - Calling Refund for Refund", MODULE);
                 response = processCardRefundPayment(ctx, context);
             }
         }
 
-        Debug.logInfo("SagePay ccRefund response : " + response, module);
+        Debug.logInfo("SagePay ccRefund response : " + response, MODULE);
         return response;
     }
 
@@ -380,7 +380,7 @@ public class SagePayPaymentServices {
                             "relatedTxAuthNo", captureTransaction.get("gatewayCode")
                         )
                     );
-            Debug.logInfo("SagePay - SagePayPaymentRefund result : " + paymentResult, module);
+            Debug.logInfo("SagePay - SagePayPaymentRefund result : " + paymentResult, MODULE);
 
             String status = (String) paymentResult.get("status");
             String statusDetail = (String) paymentResult.get("statusDetail");
@@ -388,15 +388,15 @@ public class SagePayPaymentServices {
             String txAuthNo = (String) paymentResult.get("txAuthNo");
 
             if (status != null && "OK".equals(status)) {
-                Debug.logInfo("SagePay Payment Refunded for Order : " + orderId, module);
+                Debug.logInfo("SagePay Payment Refunded for Order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardRefundPaymentResponse(Boolean.TRUE, txAuthNo, amount, vpsTxId, orderId, statusDetail);
             } else {
-                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + orderId, module);
+                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardRefundPaymentResponse(Boolean.FALSE, null, BigDecimal.ZERO, status, orderId, statusDetail);
             }
 
         } catch(GenericServiceException e) {
-            Debug.logError(e, "Error in calling SagePayPaymentRefund", module);
+            Debug.logError(e, "Error in calling SagePayPaymentRefund", MODULE);
             result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayPaymentRefundException", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
 
@@ -423,35 +423,35 @@ public class SagePayPaymentServices {
                         )
                     );
 
-            Debug.logInfo("SagePay - SagePayPaymentVoid result : " + paymentResult, module);
+            Debug.logInfo("SagePay - SagePayPaymentVoid result : " + paymentResult, MODULE);
 
             String status = (String) paymentResult.get("status");
             String statusDetail = (String) paymentResult.get("statusDetail");
 
             if (status != null && "OK".equals(status)) {
-                Debug.logInfo("SagePay Payment Voided for Order : " + orderId, module);
+                Debug.logInfo("SagePay Payment Voided for Order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardVoidPaymentResponse(Boolean.TRUE, amount, "SUCCESS", orderId, statusDetail);
             } else if (status != null && "MALFORMED".equals(status)) {
-                Debug.logInfo("SagePay - Malformed void request for order : " + orderId, module);
+                Debug.logInfo("SagePay - Malformed void request for order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardVoidPaymentResponse(Boolean.FALSE, BigDecimal.ZERO, "MALFORMED", orderId, statusDetail);
             } else if (status != null && "INVALID".equals(status)){
-                Debug.logInfo("SagePay - Invalid void request for order : " + orderId, module);
+                Debug.logInfo("SagePay - Invalid void request for order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardVoidPaymentResponse(Boolean.FALSE, BigDecimal.ZERO, "INVALID", orderId, statusDetail);
             } else if (status != null && "ERROR".equals(status)){
-                Debug.logInfo("SagePay - Error in void request for order : " + orderId, module);
+                Debug.logInfo("SagePay - Error in void request for order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardVoidPaymentResponse(Boolean.FALSE, BigDecimal.ZERO, "ERROR", orderId, statusDetail);
             }
 
         } catch(GenericServiceException e) {
-            Debug.logError(e, "Error in calling SagePayPaymentVoid", module);
+            Debug.logError(e, "Error in calling SagePayPaymentVoid", MODULE);
             result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayPaymentVoidException", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
         return result;
     }
 
     public static Map<String, Object> ccRelease(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered ccRelease", module);
-        Debug.logInfo("SagePay ccRelease context : " + context, module);
+        Debug.logInfo("SagePay - Entered ccRelease", MODULE);
+        Debug.logInfo("SagePay ccRelease context : " + context, MODULE);
         Locale locale = (Locale) context.get("locale");
         GenericValue orderPaymentPreference = (GenericValue) context.get("orderPaymentPreference");
 
@@ -462,7 +462,7 @@ public class SagePayPaymentServices {
         context.put("authTransaction", authTransaction);
 
         Map<String, Object> response = processCardReleasePayment(ctx, context);
-        Debug.logInfo("SagePay ccRelease response : " + response, module);
+        Debug.logInfo("SagePay ccRelease response : " + response, MODULE);
         return response;
     }
 
@@ -490,21 +490,21 @@ public class SagePayPaymentServices {
                         )
                     );
 
-            Debug.logInfo("SagePay - SagePayPaymentRelease result : " + paymentResult, module);
+            Debug.logInfo("SagePay - SagePayPaymentRelease result : " + paymentResult, MODULE);
 
             String status = (String) paymentResult.get("status");
             String statusDetail = (String) paymentResult.get("statusDetail");
 
             if (status != null && "OK".equals(status)) {
-                Debug.logInfo("SagePay Payment Released for Order : " + orderId, module);
+                Debug.logInfo("SagePay Payment Released for Order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardReleasePaymentResponse(Boolean.TRUE, null, amount, refNum, orderId, statusDetail);
             } else {
-                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + orderId, module);
+                Debug.logInfo("SagePay - Invalid status " + status + " received for order : " + orderId, MODULE);
                 result = SagePayUtil.buildCardReleasePaymentResponse(Boolean.FALSE, null, amount, refNum, orderId, statusDetail);
             }
 
         } catch(GenericServiceException e) {
-            Debug.logError(e, "Error in calling SagePayPaymentRelease", module);
+            Debug.logError(e, "Error in calling SagePayPaymentRelease", MODULE);
             result = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayPaymentReleaseException", UtilMisc.toMap("errorString", e.getMessage()), locale));
         }
 
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
index 448d031..4f8fb5c 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayServices.java
@@ -44,7 +44,7 @@ import org.apache.ofbiz.service.ServiceUtil;
 
 public class SagePayServices
 {
-    public static final String module = SagePayServices.class.getName();
+    public static final String MODULE = SagePayServices.class.getName();
     public static final String resource = "AccountingUiLabels";
 
     private static Map<String, String> buildSagePayProperties(Map<String, Object> context, Delegator delegator) {
@@ -66,17 +66,17 @@ public class SagePayServices
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
 
-        Debug.logInfo("SagePay Configuration : " + sagePayConfig.toString(), module);
+        Debug.logInfo("SagePay Configuration : " + sagePayConfig.toString(), MODULE);
         return sagePayConfig;
     }
 
     public static Map<String, Object> paymentAuthentication(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered paymentAuthentication", module);
-        Debug.logInfo("SagePay paymentAuthentication context : " + context, module);
+        Debug.logInfo("SagePay - Entered paymentAuthentication", MODULE);
+        Debug.logInfo("SagePay paymentAuthentication context : " + context, MODULE);
 
         Delegator delegator = ctx.getDelegator();
         Map<String, Object> resultMap = new HashMap<>();
@@ -280,23 +280,23 @@ public class SagePayServices
 
         } catch(UnsupportedEncodingException uee) {
             //exception in encoding parameters in httpPost
-            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", module);
+            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorEncodingParameters", UtilMisc.toMap("errorString", uee.getMessage()), locale));
         } catch(ClientProtocolException cpe) {
             //from httpClient execute
-            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", module);
+            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecute", UtilMisc.toMap("errorString", cpe.getMessage()), locale));
         } catch(IOException ioe) {
             //from httpClient execute or getResponsedata
-            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", module);
+            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecuteOrGettingResponse", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
         }
         return resultMap;
     }
 
     public static Map<String, Object> paymentAuthorisation(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered paymentAuthorisation", module);
-        Debug.logInfo("SagePay paymentAuthorisation context : " + context, module);
+        Debug.logInfo("SagePay - Entered paymentAuthorisation", MODULE);
+        Debug.logInfo("SagePay paymentAuthorisation context : " + context, MODULE);
 
         Delegator delegator = ctx.getDelegator();
         Map<String, Object> resultMap = new HashMap<>();
@@ -328,7 +328,7 @@ public class SagePayServices
         parameters.put("TxAuthNo", txAuthNo);
         parameters.put("ReleaseAmount", amount);
 
-        Debug.logInfo("authorization parameters -> " + parameters, module);
+        Debug.logInfo("authorization parameters -> " + parameters, MODULE);
         //end - authorization parameters
 
         try (CloseableHttpClient httpClient = SagePayUtil.getHttpClient()) {
@@ -372,23 +372,23 @@ public class SagePayServices
 
         } catch(UnsupportedEncodingException uee) {
             //exception in encoding parameters in httpPost
-            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", module);
+            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorEncodingParameters", UtilMisc.toMap("errorString", uee.getMessage()), locale));
         } catch(ClientProtocolException cpe) {
             //from httpClient execute
-            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", module);
+            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecute", UtilMisc.toMap("errorString", cpe.getMessage()), locale));
         } catch(IOException ioe) {
             //from httpClient execute or getResponsedata
-            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", module);
+            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecuteOrGettingResponse", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
         }
         return resultMap;
     }
 
     public static Map<String, Object> paymentRelease(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered paymentRelease", module);
-        Debug.logInfo("SagePay paymentRelease context : " + context, module);
+        Debug.logInfo("SagePay - Entered paymentRelease", MODULE);
+        Debug.logInfo("SagePay paymentRelease context : " + context, MODULE);
 
         Delegator delegator = ctx.getDelegator();
         Map<String, Object> resultMap = new HashMap<>();
@@ -461,23 +461,23 @@ public class SagePayServices
 
         }  catch(UnsupportedEncodingException uee) {
             //exception in encoding parameters in httpPost
-            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", module);
+            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorEncodingParameters", UtilMisc.toMap("errorString", uee.getMessage()), locale));
         } catch(ClientProtocolException cpe) {
             //from httpClient execute
-            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", module);
+            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecute", UtilMisc.toMap("errorString", cpe.getMessage()), locale));
         } catch(IOException ioe) {
             //from httpClient execute or getResponsedata
-            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", module);
+            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecuteOrGettingResponse", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
         }
         return resultMap;
     }
 
     public static Map<String, Object> paymentVoid(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered paymentVoid", module);
-        Debug.logInfo("SagePay paymentVoid context : " + context, module);
+        Debug.logInfo("SagePay - Entered paymentVoid", MODULE);
+        Debug.logInfo("SagePay paymentVoid context : " + context, MODULE);
 
         Delegator delegator = ctx.getDelegator();
         Map<String, Object> resultMap = new HashMap<>();
@@ -548,23 +548,23 @@ public class SagePayServices
 
         }  catch(UnsupportedEncodingException uee) {
             //exception in encoding parameters in httpPost
-            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", module);
+            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorEncodingParameters", UtilMisc.toMap("errorString", uee.getMessage()), locale));
         } catch(ClientProtocolException cpe) {
             //from httpClient execute
-            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", module);
+            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecute", UtilMisc.toMap("errorString", cpe.getMessage()), locale));
         } catch(IOException ioe) {
             //from httpClient execute or getResponsedata
-            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", module);
+            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecuteOrGettingResponse", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
         }
         return resultMap;
     }
 
     public static Map<String, Object> paymentRefund(DispatchContext ctx, Map<String, Object> context) {
-        Debug.logInfo("SagePay - Entered paymentRefund", module);
-        Debug.logInfo("SagePay paymentRefund context : " + context, module);
+        Debug.logInfo("SagePay - Entered paymentRefund", MODULE);
+        Debug.logInfo("SagePay paymentRefund context : " + context, MODULE);
 
         Delegator delegator = ctx.getDelegator();
         Map<String, Object> resultMap = new HashMap<>();
@@ -610,7 +610,7 @@ public class SagePayServices
             HttpResponse response = httpClient.execute(host, httpPost);
             Map<String, String> responseData = SagePayUtil.getResponseData(response);
 
-            Debug.logInfo("response data -> " + responseData, module);
+            Debug.logInfo("response data -> " + responseData, MODULE);
 
             String status = responseData.get("Status");
             String statusDetail = responseData.get("StatusDetail");
@@ -655,15 +655,15 @@ public class SagePayServices
 
         }  catch(UnsupportedEncodingException uee) {
             //exception in encoding parameters in httpPost
-            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", module);
+            Debug.logError(uee, "Error occurred in encoding parameters for HttpPost (" + uee.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorEncodingParameters", UtilMisc.toMap("errorString", uee.getMessage()), locale));
         } catch(ClientProtocolException cpe) {
             //from httpClient execute
-            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", module);
+            Debug.logError(cpe, "Error occurred in HttpClient execute(" + cpe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecute", UtilMisc.toMap("errorString", cpe.getMessage()), locale));
         } catch(IOException ioe) {
             //from httpClient execute or getResponsedata
-            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", module);
+            Debug.logError(ioe, "Error occurred in HttpClient execute or getting response (" + ioe.getMessage() + ")", MODULE);
             resultMap = ServiceUtil.returnError(UtilProperties.getMessage(resource, "AccountingSagePayErrorHttpClientExecuteOrGettingResponse", UtilMisc.toMap("errorString", ioe.getMessage()), locale));
         }
 
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
index 40dc9fe..967efa4 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java
@@ -45,7 +45,7 @@ import org.apache.ofbiz.base.util.Debug;
 
 public final class SagePayUtil {
 
-    public static final String module = SagePayUtil.class.getName();
+    public static final String MODULE = SagePayUtil.class.getName();
     private SagePayUtil() {}
 
     public static Map<String, Object> buildCardAuthorisationPaymentResponse
@@ -162,7 +162,7 @@ public final class SagePayUtil {
                 reader.close();
             }
         }
-        Debug.logInfo("SagePay Response Data : " + responseData, module);
+        Debug.logInfo("SagePay Response Data : " + responseData, MODULE);
         return responseData;
     }
 
@@ -176,7 +176,7 @@ public final class SagePayUtil {
             postParameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
         }
 
-        Debug.logInfo("SagePay PostParameters - " + postParameters, module);
+        Debug.logInfo("SagePay PostParameters - " + postParameters, MODULE);
 
         HttpEntity postEntity = new UrlEncodedFormEntity(postParameters);
         httpPost.setEntity(postEntity);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
index eeb1880..02a7a55 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayPaymentServices.java
@@ -42,7 +42,7 @@ import securepay.jxa.api.Txn;
 
 public class SecurePayPaymentServices {
 
-    public static final String module = SecurePayPaymentServices.class.getName();
+    public static final String MODULE = SecurePayPaymentServices.class.getName();
     public final static String resource = "AccountingUiLabels";
 
     public static Map<String, Object> doAuth(DispatchContext dctx, Map<String, Object> context) {
@@ -308,7 +308,7 @@ public class SecurePayPaymentServices {
                     .queryFirst();
             referenceNum = paymentGatewayResponse != null ? paymentGatewayResponse.get("referenceNum") : authTransaction.getString("referenceNum");
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         Properties props = buildScProperties(context, delegator);
@@ -489,7 +489,7 @@ public class SecurePayPaymentServices {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java
index c0c7250..49b18ea 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/securepay/SecurePayServiceTest.java
@@ -39,7 +39,7 @@ public class SecurePayServiceTest extends OFBizTestCase{
         super(name);
     }
     
-    public static final String module = SecurePayServiceTest.class.getName();
+    public static final String MODULE = SecurePayServiceTest.class.getName();
 
     // test data
     protected GenericValue emailAddr = null;
@@ -111,7 +111,7 @@ public class SecurePayServiceTest extends OFBizTestCase{
     }
 
     public void testAuth() throws Exception{
-        Debug.logInfo("=====[testAuth] starting....", module);
+        Debug.logInfo("=====[testAuth] starting....", MODULE);
         try {
             Map<String, Object> serviceInput = UtilMisc.<String, Object>toMap(
                     "paymentConfig", configFile,
@@ -132,14 +132,14 @@ public class SecurePayServiceTest extends OFBizTestCase{
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testCCAuth] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testCCAuth] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
 
             if (((Boolean) result.get("authResult")).equals(Boolean.FALSE)) {          // returnCode ok?
-                Debug.logInfo("[testAuth] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testAuth] Error Messages from SecurePay: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             } else {
-                Debug.logInfo("[testAuth] Result from SecurePay: " + result, module);
+                Debug.logInfo("[testAuth] Result from SecurePay: " + result, MODULE);
                 String authRefNum = (String) result.get("authRefNum");
                 BigDecimal processAmount =  (BigDecimal) result.get("processAmount");
                 paymentGatewayResponse = delegator.makeValue("PaymentGatewayResponse" , UtilMisc.toMap(
@@ -162,7 +162,7 @@ public class SecurePayServiceTest extends OFBizTestCase{
     }
 
     public void testdoCapture() throws Exception {
-        Debug.logInfo("=====[testdoCapture] starting....", module);
+        Debug.logInfo("=====[testdoCapture] starting....", MODULE);
         GenericValue paymentGatewayResponse = EntityQuery.use(delegator).from("PaymentGatewayResponse").where("paymentGatewayResponseId", "testOrder1000_01").queryOne();
         try {
             Map<String, Object> serviceInput = UtilMisc.<String, Object>toMap(
@@ -177,18 +177,18 @@ public class SecurePayServiceTest extends OFBizTestCase{
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testdoCapture] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testdoCapture] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
 
             if (((Boolean) result.get("captureResult")).equals(Boolean.FALSE)) {          // returnCode ok?
-                Debug.logInfo("[testdoCapture] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testdoCapture] Error Messages from SecurePay: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             } else {
                 String captureRefNum = (String) result.get("captureRefNum");
                 GenericValue checkPaymentGatewayResponse = EntityQuery.use(delegator).from("PaymentGatewayResponse").where("paymentGatewayResponseId", "testOrder1000_01").queryOne();
                 checkPaymentGatewayResponse.set("referenceNum", captureRefNum);
                 checkPaymentGatewayResponse.store();
-                Debug.logInfo("[testdoCapture] Result from SecurePay: " + result, module);
+                Debug.logInfo("[testdoCapture] Result from SecurePay: " + result, MODULE);
             }
             
         } catch (GenericServiceException ex) {
@@ -197,7 +197,7 @@ public class SecurePayServiceTest extends OFBizTestCase{
     }
 
     public void testdoRefund() throws Exception {
-        Debug.logInfo("=====[testdoRefund] starting....", module);
+        Debug.logInfo("=====[testdoRefund] starting....", MODULE);
         try {
             Map<String, Object> serviceInput = UtilMisc.toMap(
                     "paymentConfig", configFile,
@@ -209,14 +209,14 @@ public class SecurePayServiceTest extends OFBizTestCase{
 
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testdoRefund] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testdoRefund] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
 
             if (((Boolean) result.get("refundResult")).equals(Boolean.FALSE)) {          // returnCode ok?
-                Debug.logInfo("[testdoRefund] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testdoRefund] Error Messages from SecurePay: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             } else {
-                Debug.logInfo("[testdoRefund] Result from SecurePay: " + result, module);
+                Debug.logInfo("[testdoRefund] Result from SecurePay: " + result, MODULE);
             }
 
         } catch (GenericServiceException ex) {
@@ -225,7 +225,7 @@ public class SecurePayServiceTest extends OFBizTestCase{
     }
 
     public void testdoCredit() throws Exception{
-        Debug.logInfo("=====[testdoCredit] starting....", module);
+        Debug.logInfo("=====[testdoCredit] starting....", MODULE);
         try {
             Map<String, Object> serviceInput = UtilMisc.toMap(
                     "paymentConfig", configFile,
@@ -242,14 +242,14 @@ public class SecurePayServiceTest extends OFBizTestCase{
             Map<String, Object> result = dispatcher.runSync("ofbScCCCredit",serviceInput);
             // verify the results
             String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
-            Debug.logInfo("[testdoCredit] responseMessage: " + responseMessage, module);
+            Debug.logInfo("[testdoCredit] responseMessage: " + responseMessage, MODULE);
             TestCase.assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
 
             if (((Boolean) result.get("creditResult")).equals(Boolean.FALSE)) {          // returnCode ok?
-                Debug.logInfo("[testdoCredit] Error Messages from SecurePay: " + result.get("internalRespMsgs"), module);
+                Debug.logInfo("[testdoCredit] Error Messages from SecurePay: " + result.get("internalRespMsgs"), MODULE);
                 TestCase.fail("Returned messages:" + result.get("internalRespMsgs"));
             } else {
-                Debug.logInfo("[testdoCredit] Result from SecurePay: " + result, module);
+                Debug.logInfo("[testdoCredit] Result from SecurePay: " + result, MODULE);
             }
 
         } catch (GenericServiceException ex) {
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
index 2bf8feb..e61557a 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java
@@ -74,7 +74,7 @@ import org.apache.ofbiz.entity.util.EntityQuery;
  */
 public class ValueLinkApi {
 
-    public static final String module = ValueLinkApi.class.getName();
+    public static final String MODULE = ValueLinkApi.class.getName();
 
     // static object cache
     private static Map<String, Object> objectCache = new HashMap<>();
@@ -102,9 +102,9 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("New ValueLinkApi instance created", module);
-            Debug.logInfo("Merchant ID : " + merchantId, module);
-            Debug.logInfo("Terminal ID : " + terminalId, module);
+            Debug.logInfo("New ValueLinkApi instance created", MODULE);
+            Debug.logInfo("Merchant ID : " + merchantId, MODULE);
+            Debug.logInfo("Terminal ID : " + terminalId, MODULE);
         }
     }
 
@@ -183,15 +183,15 @@ public class ValueLinkApi {
             byte[] encryptedEan = mwkCipher.doFinal(eanBlock);
             encryptedEanHex = StringUtil.toHexString(encryptedEan);
         } catch (IllegalStateException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (IllegalBlockSizeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (BadPaddingException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (debug) {
-            Debug.logInfo("encryptPin : " + pin + " / " + encryptedEanHex, module);
+            Debug.logInfo("encryptPin : " + pin + " / " + encryptedEanHex, MODULE);
         }
 
         return encryptedEanHex;
@@ -213,15 +213,15 @@ public class ValueLinkApi {
             byte[] decryptedPin = getByteRange(decryptedEan, 8, 8);
             decryptedPinString = new String(decryptedPin, StandardCharsets.UTF_8);
         } catch (IllegalStateException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (IllegalBlockSizeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (BadPaddingException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (debug) {
-            Debug.logInfo("decryptPin : " + pin + " / " + decryptedPinString, module);
+            Debug.logInfo("decryptPin : " + pin + " / " + decryptedPinString, MODULE);
         }
 
         return decryptedPinString;
@@ -246,7 +246,7 @@ public class ValueLinkApi {
      */
     public Map<String, Object> send(String url, Map<String, Object> request) throws HttpClientException {
         if (debug) {
-            Debug.logInfo("Request : " + url + " / " + request, module);
+            Debug.logInfo("Request : " + url + " / " + request, MODULE);
         }
 
         // read the timeout value
@@ -295,11 +295,11 @@ public class ValueLinkApi {
             try {
                 keyPair = this.createKeys();
             } catch (NoSuchAlgorithmException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             } catch (InvalidAlgorithmParameterException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             } catch (InvalidKeySpecException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
 
             if (keyPair != null) {
@@ -311,7 +311,7 @@ public class ValueLinkApi {
                     return this.outputKeyCreation(loop, kekOnly, kekTest);
                 }
             } else {
-                Debug.logInfo("Returned a null KeyPair", module);
+                Debug.logInfo("Returned a null KeyPair", MODULE);
                 return this.outputKeyCreation(loop, kekOnly, kekTest);
             }
         } else {
@@ -319,7 +319,7 @@ public class ValueLinkApi {
             try {
                 privateKey = (DHPrivateKey) this.getPrivateKey();
             } catch (Exception e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
 
@@ -328,11 +328,11 @@ public class ValueLinkApi {
         try {
             kekBytes = this.generateKek(privateKey);
         } catch (NoSuchAlgorithmException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (InvalidKeySpecException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (InvalidKeyException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         // the 3DES KEK value
@@ -351,7 +351,7 @@ public class ValueLinkApi {
         try {
             kekTestC = cipher.doFinal(kekTestB);
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (!kekOnly) {
@@ -392,7 +392,7 @@ public class ValueLinkApi {
             buf.append(StringUtil.toHexString(kekTestC)).append("\n");
             buf.append("======== End KEK Test ========\n\n");
         } else {
-            Debug.logError("KEK came back empty", module);
+            Debug.logError("KEK came back empty", MODULE);
         }
 
         return buf;
@@ -435,7 +435,7 @@ public class ValueLinkApi {
         byte[] secretKey = ka.generateSecret();
 
         if (debug) {
-            Debug.logInfo("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length,  module);
+            Debug.logInfo("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length,  MODULE);
         }
 
         // generate 3DES from secret key using VL algorithm (KEK)
@@ -446,7 +446,7 @@ public class ValueLinkApi {
         byte[] kek = copyBytes(des2, first8, 0);
 
         if (debug) {
-            Debug.logInfo("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, module);
+            Debug.logInfo("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, MODULE);
         }
 
         return kek;
@@ -503,7 +503,7 @@ public class ValueLinkApi {
         try {
             keyGen = KeyGenerator.getInstance("DES");
         } catch (NoSuchAlgorithmException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         // generate the DES key 1
@@ -521,14 +521,14 @@ public class ValueLinkApi {
                     return generateMwk();
                 }
             } catch (Exception e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
 
             byte[] des3 = copyBytes(desByte1, copyBytes(desByte2, desByte3, 0), 0);
             return generateMwk(des3);
         }
 
-        Debug.logInfo("Null DES keys returned", module);
+        Debug.logInfo("Null DES keys returned", MODULE);
         return null;
     }
 
@@ -539,26 +539,26 @@ public class ValueLinkApi {
      */
     public byte[] generateMwk(byte[] desBytes) {
         if (debug) {
-            Debug.logInfo("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, module);
+            Debug.logInfo("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, MODULE);
         }
         SecretKeyFactory skf1 = null;
         SecretKey mwk = null;
         try {
             skf1 = SecretKeyFactory.getInstance("DESede");
         } catch (NoSuchAlgorithmException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         DESedeKeySpec desedeSpec2 = null;
         try {
             desedeSpec2 = new DESedeKeySpec(desBytes);
         } catch (InvalidKeyException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (skf1 != null && desedeSpec2 != null) {
             try {
                 mwk = skf1.generateSecret(desedeSpec2);
             } catch (InvalidKeySpecException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         }
         if (mwk != null) {
@@ -590,11 +590,11 @@ public class ValueLinkApi {
         try {
             encryptedZeros = cipher.doFinal(zeros);
         } catch (IllegalStateException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (IllegalBlockSizeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (BadPaddingException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         // make the 40 byte MWK - random 8 bytes + key + checksum
@@ -602,10 +602,10 @@ public class ValueLinkApi {
         newMwk = copyBytes(random, newMwk, 0);
 
         if (debug) {
-            Debug.logInfo("Random 8 byte : " + StringUtil.toHexString(random), module);
-            Debug.logInfo("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), module);
-            Debug.logInfo("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, module);
-            Debug.logInfo("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, module);
+            Debug.logInfo("Random 8 byte : " + StringUtil.toHexString(random), MODULE);
+            Debug.logInfo("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), MODULE);
+            Debug.logInfo("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, MODULE);
+            Debug.logInfo("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, MODULE);
         }
 
         return newMwk;
@@ -653,7 +653,7 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("Current Working Key Index : " + this.mwkIndex, module);
+            Debug.logInfo("Current Working Key Index : " + this.mwkIndex, MODULE);
         }
 
         return this.mwkIndex;
@@ -724,7 +724,7 @@ public class ValueLinkApi {
         request.put("EncryptID", this.getWorkingKeyIndex());
 
         if (debug) {
-            Debug.logInfo("Created Initial Request Map : " + request, module);
+            Debug.logInfo("Created Initial Request Map : " + request, MODULE);
         }
 
         return request;
@@ -739,7 +739,7 @@ public class ValueLinkApi {
         try {
             value = EntityQuery.use(delegator).from("ValueLinkKey").where("merchantId", merchantId).cache().queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (value == null) {
             throw new RuntimeException("No ValueLinkKey record found for Merchant ID : " + merchantId);
@@ -780,11 +780,11 @@ public class ValueLinkApi {
         try {
             dec = cipher.doFinal(content);
         } catch (IllegalStateException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (IllegalBlockSizeException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         } catch (BadPaddingException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         return dec;
     }
@@ -799,17 +799,17 @@ public class ValueLinkApi {
         try {
             mwkCipher = Cipher.getInstance("DESede/CBC/NoPadding");
         } catch (NoSuchAlgorithmException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return null;
         } catch (NoSuchPaddingException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         try {
             mwkCipher.init(mode, key, iv);
         } catch (InvalidKeyException e) {
-            Debug.logError(e, "Invalid key", module);
+            Debug.logError(e, "Invalid key", MODULE);
         } catch (InvalidAlgorithmParameterException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         return mwkCipher;
     }
@@ -836,8 +836,8 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("Raw MWK : " + StringUtil.toHexString(getMwk()), module);
-            Debug.logInfo("MWK : " + StringUtil.toHexString(mwk.getEncoded()), module);
+            Debug.logInfo("Raw MWK : " + StringUtil.toHexString(getMwk()), MODULE);
+            Debug.logInfo("MWK : " + StringUtil.toHexString(mwk.getEncoded()), MODULE);
         }
 
         return mwk;
@@ -849,8 +849,8 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("Raw KEK : " + StringUtil.toHexString(getKek()), module);
-            Debug.logInfo("KEK : " + StringUtil.toHexString(kek.getEncoded()), module);
+            Debug.logInfo("Raw KEK : " + StringUtil.toHexString(getKek()), MODULE);
+            Debug.logInfo("KEK : " + StringUtil.toHexString(kek.getEncoded()), MODULE);
         }
 
         return kek;
@@ -862,7 +862,7 @@ public class ValueLinkApi {
             skf = SecretKeyFactory.getInstance("DESede");
         } catch (NoSuchAlgorithmException e) {
             // should never happen since DESede is a standard algorithm
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return null;
         }
 
@@ -872,7 +872,7 @@ public class ValueLinkApi {
             try {
                 desedeSpec1 = new DESedeKeySpec(rawKey);
             } catch (InvalidKeyException e) {
-                Debug.logError(e, "Not a valid DESede key", module);
+                Debug.logError(e, "Not a valid DESede key", MODULE);
                 return null;
             }
 
@@ -881,7 +881,7 @@ public class ValueLinkApi {
             try {
                 key = skf.generateSecret(desedeSpec1);
             } catch (InvalidKeySpecException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             return key;
         } else {
@@ -903,7 +903,7 @@ public class ValueLinkApi {
 
     protected Map<String, Object> parseResponse(String response) {
         if (debug) {
-            Debug.logInfo("Raw Response : " + response, module);
+            Debug.logInfo("Raw Response : " + response, MODULE);
         }
 
         // covert to all lowercase and trim off the html header
@@ -952,7 +952,7 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("Response Map : " + responseMap, module);
+            Debug.logInfo("Response Map : " + responseMap, MODULE);
         }
 
         return responseMap;
@@ -960,7 +960,7 @@ public class ValueLinkApi {
 
     private List<Map<String, String>> parseHistoryResponse(String response) {
         if (debug) {
-            Debug.logInfo("Raw History : " + response, module);
+            Debug.logInfo("Raw History : " + response, MODULE);
         }
 
         // covert to all lowercase and trim off the html header
@@ -980,7 +980,7 @@ public class ValueLinkApi {
         testResponse = testResponse.trim();
         if (testResponse.length() == 0) {
             if (debug) {
-                Debug.logInfo("History did not contain any fields, returning null", module);
+                Debug.logInfo("History did not contain any fields, returning null", MODULE);
             }
             return null;
         }
@@ -1001,7 +1001,7 @@ public class ValueLinkApi {
         }
 
         if (debug) {
-            Debug.logInfo("History Map : " + valueMap, module);
+            Debug.logInfo("History Map : " + valueMap, MODULE);
         }
 
         return valueMap;
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
index 3cb6bf0..2c02cee 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java
@@ -50,7 +50,7 @@ import org.apache.ofbiz.service.ServiceUtil;
  */
 public class ValueLinkServices {
 
-    public static final String module = ValueLinkServices.class.getName();
+    public static final String MODULE = ValueLinkServices.class.getName();
     public final static String resource = "AccountingUiLabels";
     public final static String resourceError = "AccountingErrorUiLabels";
     public final static String resourceOrder = "OrderUiLabels";
@@ -64,11 +64,11 @@ public class ValueLinkServices {
 
         Boolean kekOnly = context.get("kekOnly") != null ? (Boolean) context.get("kekOnly") : Boolean.FALSE;
         String kekTest = (String) context.get("kekTest");
-        Debug.logInfo("KEK Only : " + kekOnly, module);
+        Debug.logInfo("KEK Only : " + kekOnly, MODULE);
 
         StringBuffer buf = vl.outputKeyCreation(kekOnly, kekTest);
         String output = buf.toString();
-        Debug.logInfo(":: Key Generation Output ::\n\n" + output, module);
+        Debug.logInfo(":: Key Generation Output ::\n\n" + output, MODULE);
 
         Map<String, Object> result = ServiceUtil.returnSuccess();
         result.put("output", output);
@@ -118,7 +118,7 @@ public class ValueLinkServices {
         buf.append("======== End Test Bytes ").append(desc).append(" ========\n\n");
 
         String output = buf.toString();
-        Debug.logInfo(":: KEK Test Output ::\n\n" + output, module);
+        Debug.logInfo(":: KEK Test Output ::\n\n" + output, MODULE);
 
         Map<String, Object> result = ServiceUtil.returnSuccess();
         result.put("output", output);
@@ -165,7 +165,7 @@ public class ValueLinkServices {
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingValueLinkCannotUpdateWorkingKey", locale));
         }
-        Debug.logInfo("Response : " + response, module);
+        Debug.logInfo("Response : " + response, MODULE);
 
         // on success update the database / reload the cached api
         String responseCode = (String) response.get("responsecode");
@@ -183,7 +183,7 @@ public class ValueLinkServices {
         try {
             vlKeys.store();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to store updated keys; the keys were changed with ValueLink : " + vlKeys, module);
+            Debug.logError(e, "Unable to store updated keys; the keys were changed with ValueLink : " + vlKeys, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingValueLinkCannotStoreWorkingKey", locale));
         }
@@ -262,7 +262,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Activate Result : " + result, module);
+        Debug.logInfo("Activate Result : " + result, MODULE);
         return result;
 
     }
@@ -312,7 +312,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Link Result : " + result, module);
+        Debug.logInfo("Link Result : " + result, MODULE);
         return result;
     }
 
@@ -364,7 +364,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Disable Result : " + result, module);
+        Debug.logInfo("Disable Result : " + result, MODULE);
         return result;
     }
 
@@ -426,7 +426,7 @@ public class ValueLinkServices {
         result.put("cardClass", response.get("cardclass"));
         result.put("cashBack", vl.getAmount((String) response.get("cashback")));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Redeem Result : " + result, module);
+        Debug.logInfo("Redeem Result : " + result, MODULE);
         return result;
 
     }
@@ -488,7 +488,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Reload Result : " + result, module);
+        Debug.logInfo("Reload Result : " + result, MODULE);
         return result;
 
     }
@@ -540,7 +540,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Balance Result : " + result, module);
+        Debug.logInfo("Balance Result : " + result, MODULE);
         return result;
 
     }
@@ -591,7 +591,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("History Result : " + result, module);
+        Debug.logInfo("History Result : " + result, MODULE);
         return result;
 
     }
@@ -653,7 +653,7 @@ public class ValueLinkServices {
         result.put("expireDate", response.get("expiredate"));
         result.put("cardClass", response.get("cardclass"));
         result.put("referenceNum", response.get("traceno"));
-        Debug.logInfo("Refund Result : " + result, module);
+        Debug.logInfo("Refund Result : " + result, MODULE);
         return result;
 
     }
@@ -681,7 +681,7 @@ public class ValueLinkServices {
     public static Map<String, Object> timeOutReversal(DispatchContext dctx, Map<String, Object> context) {
         String vlInterface = (String) context.get("Interface");
         Locale locale = (Locale) context.get("locale");
-        Debug.logInfo("704 Interface : " + vlInterface, module);
+        Debug.logInfo("704 Interface : " + vlInterface, MODULE);
         if (vlInterface != null) {
             if (vlInterface.startsWith("Activate")) {
                 if ("Activate/Rollback".equals(vlInterface)) {
@@ -724,12 +724,12 @@ public class ValueLinkServices {
         // Activate/Rollback is not supported by valuelink
         if (!"Activate".equals(vlInterface)) {
             // create the listener
-            Debug.logInfo("Set 704 context : " + context, module);
+            Debug.logInfo("Set 704 context : " + context, MODULE);
             try {
                 dctx.getDispatcher().addRollbackService("vlTimeOutReversal", context, false);
                 //dctx.getDispatcher().addCommitService("vlTimeOutReversal", context, false);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Unable to setup 0704 Timeout Reversal", module);
+                Debug.logError(e, "Unable to setup 0704 Timeout Reversal", MODULE);
             }
         }
     }
@@ -777,7 +777,7 @@ public class ValueLinkServices {
         try {
             redeemResult = dispatcher.runSync("redeemGiftCard", redeemCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Problem calling the redeem service", module);
+            Debug.logError(e, "Problem calling the redeem service", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingValueLinkUnableToRedeemGiftCardFailure", locale));
         }
@@ -792,14 +792,14 @@ public class ValueLinkServices {
                 BigDecimal current = (BigDecimal) redeemResult.get("amount");
                 if (current == null) current = BigDecimal.ZERO;
                 BigDecimal redeemed = previous.subtract(current);
-                Debug.logInfo("Redeemed (" + amount + "): " + redeemed + " / " + previous + " : " + current, module);
+                Debug.logInfo("Redeemed (" + amount + "): " + redeemed + " / " + previous + " : " + current, MODULE);
                 if (redeemed.compareTo(amount) < 0) {
                     // we didn't redeem enough void the transaction and return false
                     Map<String, Object> voidResult = null;
                     try {
                         voidResult = dispatcher.runSync("voidRedeemGiftCard", redeemCtx);
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, module);
+                        Debug.logError(e, MODULE);
                     }
                     if (ServiceUtil.isError(voidResult)) {
                         return voidResult;
@@ -840,7 +840,7 @@ public class ValueLinkServices {
         try {
             giftCard = paymentPref.getRelatedOne("GiftCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError("Unable to get GiftCard from OrderPaymentPreference", module);
+            Debug.logError("Unable to get GiftCard from OrderPaymentPreference", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
         }
@@ -869,7 +869,7 @@ public class ValueLinkServices {
         try {
             redeemResult = dispatcher.runSync("voidRedeemGiftCard", redeemCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Problem calling the redeem service", module);
+            Debug.logError(e, "Problem calling the redeem service", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingValueLinkUnableToRedeemGiftCardFailure", locale));
         }
@@ -905,7 +905,7 @@ public class ValueLinkServices {
         try {
             giftCard = paymentPref.getRelatedOne("GiftCard", false);
         } catch (GenericEntityException e) {
-            Debug.logError("Unable to get GiftCard from OrderPaymentPreference", module);
+            Debug.logError("Unable to get GiftCard from OrderPaymentPreference", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
                     "AccountingGiftCertificateNumberCannotLocateItFromOrderPaymentPreference", locale));
         }
@@ -934,7 +934,7 @@ public class ValueLinkServices {
         try {
             redeemResult = dispatcher.runSync("refundGiftCard", refundCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Problem calling the refund service", module);
+            Debug.logError(e, "Problem calling the refund service", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingValueLinkUnableToRefundGiftCardFailure", locale));
         }
@@ -970,7 +970,7 @@ public class ValueLinkServices {
         try {
             orderHeader = orderItem.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get OrderHeader from OrderItem",module);
+            Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -1024,7 +1024,7 @@ public class ValueLinkServices {
         try {
             product = orderItem.getRelatedOne("Product", false);
         } catch (GenericEntityException e) {
-            Debug.logError("Unable to get Product from OrderItem", module);
+            Debug.logError("Unable to get Product from OrderItem", MODULE);
         }
         if (product == null) {
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError, 
@@ -1040,7 +1040,7 @@ public class ValueLinkServices {
                             "productFeatureTypeId", "TYPE")
                     .orderBy("-fromDate").filterByDate().queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingValueLinkUnableToGetFeatureType", locale));
         }
@@ -1069,7 +1069,7 @@ public class ValueLinkServices {
                             "surveyId", surveyId)
                     .queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
         }
@@ -1079,7 +1079,7 @@ public class ValueLinkServices {
         try {
             responseAnswers = surveyResponse.getRelated("SurveyResponseAnswer", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
         }
@@ -1092,7 +1092,7 @@ public class ValueLinkServices {
                 try {
                     question = answer.getRelatedOne("SurveyQuestion", false);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                             "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
                 }
@@ -1131,7 +1131,7 @@ public class ValueLinkServices {
             try {
                 activateResult = dispatcher.runSync("activateGiftCard", activateCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Unable to activate gift card(s)", module);
+                Debug.logError(e, "Unable to activate gift card(s)", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingValueLinkUnableToActivateGiftCard", locale));
             }
@@ -1146,7 +1146,7 @@ public class ValueLinkServices {
                 try {
                     dispatcher.addRollbackService("voidActivateGiftCard", activateCtx, false);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Unable to setup Activate/Void on error", module);
+                    Debug.logError(e, "Unable to setup Activate/Void on error", MODULE);
                 }
             }
 
@@ -1168,7 +1168,7 @@ public class ValueLinkServices {
             try {
                 dispatcher.runAsync("createGcFulFillmentRecord", vlFulFill, true);
             } catch (GenericServiceException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                         "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo",
                         UtilMisc.toMap("errorString", e.toString() ), locale));
@@ -1190,10 +1190,10 @@ public class ValueLinkServices {
             try {
                 productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Unable to get product store email setting for gift card purchase", module);
+                Debug.logError(e, "Unable to get product store email setting for gift card purchase", MODULE);
             }
             if (productStoreEmail == null) {
-                Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module);
+                Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", MODULE);
             } else {
                 answerMap.put("locale", locale);
 
@@ -1226,7 +1226,7 @@ public class ValueLinkServices {
                 try {
                     dispatcher.runAsync("sendMailFromScreen", emailCtx);
                 } catch (GenericServiceException e) {
-                    Debug.logError(e, "Problem sending mail", module);
+                    Debug.logError(e, "Problem sending mail", MODULE);
                     // this is fatal; we will rollback and try again later
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                             "AccountingGiftCertificateNumberCannotSendEmailNotice",
@@ -1254,7 +1254,7 @@ public class ValueLinkServices {
         try {
             orderHeader = orderItem.getRelatedOne("OrderHeader", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get OrderHeader from OrderItem",module);
+            Debug.logError(e, "Unable to get OrderHeader from OrderItem",MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceOrder, 
                     "OrderOrderNotFound", UtilMisc.toMap("orderId", orderId), locale));
         }
@@ -1314,7 +1314,7 @@ public class ValueLinkServices {
                             "surveyId", surveyId).orderBy("-responseDate")
                     .queryFirst();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingGiftCertificateNumberCannotFulfillFromSurvey", locale));
         }
@@ -1324,7 +1324,7 @@ public class ValueLinkServices {
         try {
             responseAnswers = surveyResponse.getRelated("SurveyResponseAnswer", null, null, false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
         }
@@ -1337,7 +1337,7 @@ public class ValueLinkServices {
                 try {
                     question = answer.getRelatedOne("SurveyQuestion", false);
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                             "AccountingGiftCertificateNumberCannotFulfillFromSurveyAnswers", locale));
                 }
@@ -1369,7 +1369,7 @@ public class ValueLinkServices {
         try {
             reloadResult = dispatcher.runSync("reloadGiftCard", reloadCtx);
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Unable to reload gift card", module);
+            Debug.logError(e, "Unable to reload gift card", MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                     "AccountingValueLinkUnableToReloadGiftCard", locale));
         }
@@ -1392,14 +1392,14 @@ public class ValueLinkServices {
         try {
             dispatcher.runAsync("createGcFulFillmentRecord", vlFulFill, true);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resourceError,
                     "AccountingGiftCertificateNumberCannotStoreFulfillmentInfo", locale));
         }
 
         Boolean processResult = (Boolean) reloadResult.get("processResult");
         if (reloadResult.containsKey(ModelService.ERROR_MESSAGE) || !processResult) {
-            Debug.logError("Reload Failed Need to Refund : " + reloadResult, module);
+            Debug.logError("Reload Failed Need to Refund : " + reloadResult, MODULE);
 
             // process the return
             try {
@@ -1407,7 +1407,7 @@ public class ValueLinkServices {
                         "partyId", partyId, "userLogin", userLogin);
                 dispatcher.runAsync("refundGcPurchase", refundCtx, null, true, 300, true);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "ERROR! Unable to call create refund service; this failed reload will NOT be refunded", module);
+                Debug.logError(e, "ERROR! Unable to call create refund service; this failed reload will NOT be refunded", MODULE);
             }
 
             String responseCode = "-1";
@@ -1415,11 +1415,11 @@ public class ValueLinkServices {
                 responseCode = (String) reloadResult.get("responseCode");
             }
             if ("17".equals(responseCode)) {
-                Debug.logError("Error code : " + responseCode + " : Max Balance Exceeded", module);
+                Debug.logError("Error code : " + responseCode + " : Max Balance Exceeded", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingValueLinkUnableToRefundGiftCardMaxBalanceExceeded", locale));
             } else {
-                Debug.logError("Error code : " + responseCode + " : Processing Error", module);
+                Debug.logError("Error code : " + responseCode + " : Processing Error", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingValueLinkUnableToReloadGiftCardFailed", locale));
             }
@@ -1437,10 +1437,10 @@ public class ValueLinkServices {
         try {
             productStoreEmail = EntityQuery.use(delegator).from("ProductStoreEmailSetting").where("productStoreId", productStoreId, "emailType", emailType).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Unable to get product store email setting for gift card purchase", module);
+            Debug.logError(e, "Unable to get product store email setting for gift card purchase", MODULE);
         }
         if (productStoreEmail == null) {
-            Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", module);
+            Debug.logError("No gift card purchase email setting found for this store; cannot send gift card information", MODULE);
         } else {
             Map<String, Object> emailCtx = new HashMap<>();
             answerMap.put("locale", locale);
@@ -1463,7 +1463,7 @@ public class ValueLinkServices {
             try {
                 dispatcher.runAsync("sendMailFromScreen", emailCtx);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problem sending mail", module);
+                Debug.logError(e, "Problem sending mail", MODULE);
                 // this is fatal; we will rollback and try again later
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource,
                         "AccountingGiftCertificateNumberCannotSendEmailNotice",
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
index fb799d9..1da0edc 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/verisign/PayflowPro.java
@@ -57,7 +57,7 @@ import paypal.payflow.SDKProperties;
  */
 public class PayflowPro {
 
-    public static final String module = PayflowPro.class.getName();
+    public static final String MODULE = PayflowPro.class.getName();
     public final static String resource = "AccountingUiLabels";
 
     /**
@@ -164,7 +164,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        //if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        //if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -173,7 +173,7 @@ public class PayflowPro {
         }
 
         if (Debug.verboseOn()) {
-            Debug.logVerbose("Response from Verisign: " + resp, module);
+            Debug.logVerbose("Response from Verisign: " + resp, MODULE);
         }
         if (isPayPal) {
             // Attach the avs info returned in doExpressCheckout and stored in PayPalPaymentMethod
@@ -247,7 +247,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -255,7 +255,7 @@ public class PayflowPro {
             resp = "RESULT=0&AUTHCODE=T&PNREF=" + (new Date()).getTime() + "&RESPMSG=Testing";
         }
 
-        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, module);
+        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, MODULE);
 
         // check the response
         Map<String, Object> result = ServiceUtil.returnSuccess();
@@ -325,7 +325,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -333,7 +333,7 @@ public class PayflowPro {
             resp = "RESULT=0&AUTHCODE=T&PNREF=" + (new Date()).getTime() + "&RESPMSG=Testing";
         }
 
-        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, module);
+        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, MODULE);
 
         // check the response
         Map<String, Object> result = ServiceUtil.returnSuccess();
@@ -402,7 +402,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -410,7 +410,7 @@ public class PayflowPro {
             resp = "RESULT=0&AUTHCODE=T&PNREF=" + (new Date()).getTime() + "&RESPMSG=Testing";
         }
 
-        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, module);
+        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, MODULE);
 
         // check the response
         Map<String, Object> result = ServiceUtil.returnSuccess();
@@ -448,7 +448,7 @@ public class PayflowPro {
         try {
             addCartDetails(data, cart);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, 
                     "AccountingPayflowErrorRetreivingCartDetails", locale));
         }
@@ -462,7 +462,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -470,13 +470,13 @@ public class PayflowPro {
             resp = "RESULT=0&TOKEN=" + (new Date()).getTime() + "&RESPMSG=Testing";
         }
 
-        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, module);
+        if (Debug.verboseOn()) Debug.logVerbose("Response from Verisign: " + resp, MODULE);
 
         Map<String, String> responseMap = parseResponse(resp);
         String result = responseMap.get("RESULT");
         if (!"0".equals(result)) {
             String respMsg = responseMap.get("RESPMSG");
-            Debug.logError("A problem occurred while requesting an express checkout token from paypal: Result = " + result + ", Message = " + respMsg, module);
+            Debug.logError("A problem occurred while requesting an express checkout token from paypal: Result = " + result + ", Message = " + respMsg, MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage("AccountingErrorUiLabels", 
                     "AccountingPayPalCommunicationError", locale));
         }
@@ -561,7 +561,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -571,7 +571,7 @@ public class PayflowPro {
 
         Map<String, String> responseMap = parseResponse(resp);
         if (!"0".equals(responseMap.get("RESULT"))) {
-            Debug.logError("A problem occurred while requesting the checkout details from paypal: Result = " + responseMap.get("RESULT") + ", Message = " + responseMap.get("RESPMSG"), module);
+            Debug.logError("A problem occurred while requesting the checkout details from paypal: Result = " + responseMap.get("RESULT") + ", Message = " + responseMap.get("RESPMSG"), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage("AccountingErrorUiLabels", 
                     "AccountingPayPalCommunicationError", locale));
         }
@@ -591,7 +591,7 @@ public class PayflowPro {
         try {
             outMap = dispatcher.runSync("createPayPalPaymentMethod", inMap);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         String paymentMethodId = (String) outMap.get("paymentMethodId");
@@ -617,7 +617,7 @@ public class PayflowPro {
             payPalPaymentMethod = paymentPref.getRelatedOne("PaymentMethod", false);
             payPalPaymentMethod = payPalPaymentMethod.getRelatedOne("PayPalPaymentMethod", false);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         BigDecimal processAmount = paymentPref.getBigDecimal("maxAmount");
@@ -640,7 +640,7 @@ public class PayflowPro {
         params.append("&").append(parseContext(data));
 
         // transmit the request
-        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), module);
+        if (Debug.verboseOn()) Debug.logVerbose("Sending to Verisign: " + params.toString(), MODULE);
         String resp;
         if (!comparePaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "enableTransmit", configString, "payment.verisign.enable_transmit",  "false")) {
             resp = pfp.submitTransaction(params.toString(), pfp.generateRequestId());
@@ -658,18 +658,18 @@ public class PayflowPro {
         try {
             outMap = dispatcher.runSync("updatePayPalPaymentMethod", inMap);
         } catch (GenericServiceException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.getMessage());
         }
         if (ServiceUtil.isError(outMap)) {
-            Debug.logError(ServiceUtil.getErrorMessage(outMap), module);
+            Debug.logError(ServiceUtil.getErrorMessage(outMap), MODULE);
             return outMap;
         }
         return ServiceUtil.returnSuccess();
     }
 
     private static Map<String, String> parseResponse(String resp) {
-        Debug.logInfo("Verisign response string: " + resp, module);
+        Debug.logInfo("Verisign response string: " + resp, MODULE);
         Map<String, String> parameters = new HashMap<String, String>();
         List<String> params = StringUtil.split(resp, "&");
         for (String str : params) {
@@ -723,7 +723,7 @@ public class PayflowPro {
         try {
             codeInt = Integer.parseInt(respCode);
         } catch (NumberFormatException e) {
-            Debug.logError(e, "Unable to parse response code; not a number!", module);
+            Debug.logError(e, "Unable to parse response code; not a number!", MODULE);
         }
 
 
@@ -734,16 +734,16 @@ public class PayflowPro {
             result.put("authCode", parameters.get("AUTHCODE"));
         } else if (codeInt < 0) {
             // communications error
-            Debug.logWarning("In PayflowPro failing authorization; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing authorization; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("authResult", Boolean.FALSE);
             result.put("authRefNum", respCode);
         } else if (codeInt == 0) {
-            Debug.logWarning("In PayflowPro approved, but invalid flags; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro approved, but invalid flags; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("authResult", Boolean.TRUE);
             result.put("authCode", parameters.get("AUTHCODE"));
         } else {
             // other error
-            Debug.logWarning("In PayflowPro failing authorization; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing authorization; respCode/RESULT=" + respCode + ", avsCheckOkay=" + avsCheckOkay + ", cvv2CheckOkay=" + cvv2CheckOkay + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("authResult", Boolean.FALSE);
 
             // now check certain special conditions and report back through the generic params
@@ -771,7 +771,7 @@ public class PayflowPro {
         try {
             codeInt = Integer.parseInt(respCode);
         } catch (NumberFormatException e) {
-            Debug.logError(e, "Unable to parse response code; not a number!", module);
+            Debug.logError(e, "Unable to parse response code; not a number!", MODULE);
         }
 
         if (codeInt == 0) {
@@ -779,11 +779,11 @@ public class PayflowPro {
             result.put("captureCode", parameters.get("AUTHCODE"));
         } else if (codeInt < 0) {
             // communications error
-            Debug.logWarning("In PayflowPro failing capture; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing capture; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("captureResult", Boolean.FALSE);
             result.put("captureRefNum", respCode);
         } else {
-            Debug.logWarning("In PayflowPro failing capture; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing capture; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("captureResult", Boolean.FALSE);
         }
         result.put("captureRefNum", parameters.get("PNREF"));
@@ -799,7 +799,7 @@ public class PayflowPro {
         try {
             codeInt = Integer.parseInt(respCode);
         } catch (NumberFormatException e) {
-            Debug.logError(e, "Unable to parse response code; not a number!", module);
+            Debug.logError(e, "Unable to parse response code; not a number!", MODULE);
         }
 
         if (codeInt == 0) {
@@ -807,11 +807,11 @@ public class PayflowPro {
             result.put("releaseCode", parameters.get("AUTHCODE"));
         } else if (codeInt < 0) {
             // communications error
-            Debug.logWarning("In PayflowPro failing void; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing void; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("releaseResult", Boolean.FALSE);
             result.put("releaseRefNum", respCode);
         } else {
-            Debug.logWarning("In PayflowPro failing void; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing void; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("releaseResult", Boolean.FALSE);
         }
         result.put("releaseRefNum", parameters.get("PNREF"));
@@ -827,7 +827,7 @@ public class PayflowPro {
         try {
             codeInt = Integer.parseInt(respCode);
         } catch (NumberFormatException e) {
-            Debug.logError(e, "Unable to parse response code; not a number!", module);
+            Debug.logError(e, "Unable to parse response code; not a number!", MODULE);
         }
 
         if (codeInt == 0) {
@@ -835,11 +835,11 @@ public class PayflowPro {
             result.put("refundCode", parameters.get("AUTHCODE"));
         } else if (codeInt < 0) {
             // communications error
-            Debug.logWarning("In PayflowPro failing refund; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing refund; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("refundResult", Boolean.FALSE);
             result.put("refundRefNum", respCode);
         } else {
-            Debug.logWarning("In PayflowPro failing refund; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), module);
+            Debug.logWarning("In PayflowPro failing refund; respCode/RESULT=" + respCode + "; PNREF=" + parameters.get("PNREF") + "; AUTHCODE=" + parameters.get("AUTHCODE"), MODULE);
             result.put("refundResult", Boolean.FALSE);
         }
         result.put("refundRefNum", parameters.get("PNREF"));
@@ -887,7 +887,7 @@ public class PayflowPro {
             buf.append("PWD=");
             buf.append(getPaymentGatewayConfigValue(delegator, paymentGatewayConfigId, "pwd", resource, "payment.verisign.pwd", "password"));
         } catch (Exception e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return null;
         }
         return buf;
@@ -930,7 +930,7 @@ public class PayflowPro {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
index dabfc88..e9889a8 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/worldpay/WorldPayEvents.java
@@ -58,7 +58,7 @@ public class WorldPayEvents {
     public static final String resource = "AccountingUiLabels";
     public static final String resourceErr = "AccountingErrorUiLabels";
     public static final String commonResource = "CommonUiLabels";
-    public static final String module = WorldPayEvents.class.getName();
+    public static final String MODULE = WorldPayEvents.class.getName();
 
     public static String worldPayRequest(HttpServletRequest request, HttpServletResponse response) {
         Locale locale = UtilHttp.getLocale(request);
@@ -70,7 +70,7 @@ public class WorldPayEvents {
         try {
             orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get the order header for order: " + orderId, module);
+            Debug.logError(e, "Cannot get the order header for order: " + orderId, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingOrderHeader", locale));
             return "error";
         }
@@ -79,7 +79,7 @@ public class WorldPayEvents {
         // get the product store
         GenericValue productStore = ProductStoreWorker.getProductStore(request);
         if (productStore == null) {
-            Debug.logError("ProductStore is null", module);
+            Debug.logError("ProductStore is null", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingMerchantConfiguration", locale));
             return "error";
         }
@@ -117,7 +117,7 @@ public class WorldPayEvents {
             }
             contactAddress = EntityQuery.use(delegator).from("PostalAddress").where("contactMechId", addressOcm.getString("contactMechId")).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, "Problems getting order contact information", module);
+            Debug.logWarning(e, "Problems getting order contact information", MODULE);
         }
         // get the country geoID
         GenericValue countryGeo = null;
@@ -129,7 +129,7 @@ public class WorldPayEvents {
                     country = countryGeo.getString("geoCode");
                 }
             } catch (GenericEntityException e) {
-                Debug.logWarning(e, "Problems getting country geo entity", module);
+                Debug.logWarning(e, "Problems getting country geo entity", MODULE);
             }
         }
         // string of customer's name
@@ -177,7 +177,7 @@ public class WorldPayEvents {
             emailContact = emailOcm.getRelatedOne("ContactMech", false);
             emailAddress = emailContact.getString("infoString");
         } catch (GenericEntityException e) {
-            Debug.logWarning(e, "Problems getting order email address", module);
+            Debug.logWarning(e, "Problems getting order email address", MODULE);
         }
         // build an shipping address string
         StringBuilder shipAddress = new StringBuilder();
@@ -218,7 +218,7 @@ public class WorldPayEvents {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logWarning(e, "Problems getting shipping address", module);
+                Debug.logWarning(e, "Problems getting shipping address", MODULE);
             }
         }
         // get the company name
@@ -230,14 +230,14 @@ public class WorldPayEvents {
                                  (company != null ? UtilProperties.getMessage(commonResource, "CommonFrom", locale) + " "+ company : "");
         // check the instId - very important
         if (instId == null || "NONE".equals(instId)) {
-            Debug.logError("Worldpay InstId not found, cannot continue", module);
+            Debug.logError("Worldpay InstId not found, cannot continue", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingInstId", locale));
             return "error";
         }
         try {
             Integer.parseInt(instId);
         } catch (NumberFormatException nfe) {
-            Debug.logError(nfe, "Problem converting instId string to integer", module);
+            Debug.logError(nfe, "Problem converting instId string to integer", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingInstIdToInteger", locale));
             return "error";
         }
@@ -246,7 +246,7 @@ public class WorldPayEvents {
             try {
                 Integer.parseInt(testMode);
             } catch (NumberFormatException nfe) {
-                Debug.logWarning(nfe, "Problems getting the testMode value, setting to 0", module);
+                Debug.logWarning(nfe, "Problems getting the testMode value, setting to 0", MODULE);
             }
         }
         // create the redirect string
@@ -297,7 +297,7 @@ public class WorldPayEvents {
         try {
             response.sendRedirect(redirectString);
         } catch (IOException e) {
-            Debug.logError(e, "Problems redirecting to WorldPay", module);
+            Debug.logError(e, "Problems redirecting to WorldPay", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsConnectingWithWorldPay", locale));
             return "error";
         }
@@ -314,7 +314,7 @@ public class WorldPayEvents {
         String orderId = request.getParameter("cartId");
         for (String name : parametersMap.keySet()) {
             String value = request.getParameter(name);
-            Debug.logError("### Param: " + name + " => " + value, module);
+            Debug.logError("### Param: " + name + " => " + value, MODULE);
         }
         // get the user
         if (userLogin == null) {
@@ -322,7 +322,7 @@ public class WorldPayEvents {
             try {
                 userLogin = EntityQuery.use(delegator).from("UserLogin").where("userLoginId", userLoginId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Cannot get UserLogin for: " + userLoginId + "; cannot continue", module);
+                Debug.logError(e, "Cannot get UserLogin for: " + userLoginId + "; cannot continue", MODULE);
                 request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingAuthenticationUser", locale));
                 return "error";
             }
@@ -333,17 +333,17 @@ public class WorldPayEvents {
             try {
                 orderHeader = EntityQuery.use(delegator).from("OrderHeader").where("orderId", orderId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Cannot get the order header for order: " + orderId, module);
+                Debug.logError(e, "Cannot get the order header for order: " + orderId, MODULE);
                 request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingOrderHeader", locale));
                 return "error";
             }
         } else {
-            Debug.logError("WorldPay did not callback with a valid orderId!", module);
+            Debug.logError("WorldPay did not callback with a valid orderId!", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.noValidOrderIdReturned", locale));
             return "error";
         }
         if (orderHeader == null) {
-            Debug.logError("Cannot get the order header for order: " + orderId, module);
+            Debug.logError("Cannot get the order header for order: " + orderId, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.problemsGettingOrderHeader", locale));
             return "error";
         }
@@ -367,24 +367,24 @@ public class WorldPayEvents {
             }
         } catch (Exception e) {
             String errMsg = "Error handling WorldPay notification";
-            Debug.logError(e, errMsg, module);
+            Debug.logError(e, errMsg, MODULE);
             try {
                 TransactionUtil.rollback(beganTransaction, errMsg, e);
             } catch (GenericTransactionException gte2) {
-                Debug.logError(gte2, "Unable to rollback transaction", module);
+                Debug.logError(gte2, "Unable to rollback transaction", MODULE);
             }
         } finally {
             if (!okay) {
                 try {
                     TransactionUtil.rollback(beganTransaction, "Failure in processing WorldPay callback", null);
                 } catch (GenericTransactionException gte) {
-                    Debug.logError(gte, "Unable to rollback transaction", module);
+                    Debug.logError(gte, "Unable to rollback transaction", MODULE);
                 }
             } else {
                 try {
                     TransactionUtil.commit(beganTransaction);
                 } catch (GenericTransactionException gte) {
-                    Debug.logError(gte, "Unable to commit transaction", module);
+                    Debug.logError(gte, "Unable to commit transaction", MODULE);
                 }
             }
         }
@@ -394,20 +394,20 @@ public class WorldPayEvents {
             try {
                 dispatcher.runSync("sendOrderConfirmation", emailContext);
             } catch (GenericServiceException e) {
-                Debug.logError(e, "Problems sending email confirmation", module);
+                Debug.logError(e, "Problems sending email confirmation", MODULE);
             }
         }
         return "success";
     }
 
     private static boolean setPaymentPreferences(Delegator delegator, LocalDispatcher dispatcher, GenericValue userLogin, String orderId, HttpServletRequest request) {
-        if (Debug.verboseOn()) Debug.logVerbose("Setting payment preferences..", module);
+        if (Debug.verboseOn()) Debug.logVerbose("Setting payment preferences..", MODULE);
         List<GenericValue> paymentPrefs = null;
         try {
             paymentPrefs = EntityQuery.use(delegator).from("OrderPaymentPreference")
                     .where("orderId", orderId, "statusId", "PAYMENT_NOT_RECEIVED").queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot get payment preferences for order #" + orderId, module);
+            Debug.logError(e, "Cannot get payment preferences for order #" + orderId, MODULE);
             return false;
         }
         if (paymentPrefs.size() > 0) {
@@ -434,7 +434,7 @@ public class WorldPayEvents {
         try {
             authDate = new java.sql.Timestamp(paymentDate);
         } catch (Exception e) {
-            Debug.logError(e, "Cannot create date from long: " + paymentDate, module);
+            Debug.logError(e, "Cannot create date from long: " + paymentDate, MODULE);
             authDate = UtilDateTime.nowTimestamp();
         }
         paymentPreference.set("maxAmount", new BigDecimal(paymentAmount));
@@ -468,7 +468,7 @@ public class WorldPayEvents {
         try {
             delegator.storeAll(toStore);
         } catch (GenericEntityException e) {
-            Debug.logError(e, "Cannot set payment preference/payment info", module);
+            Debug.logError(e, "Cannot set payment preference/payment info", MODULE);
             return false;
         }
         // create a payment record too
@@ -478,13 +478,13 @@ public class WorldPayEvents {
             results = dispatcher.runSync("createPaymentFromPreference", UtilMisc.toMap("userLogin", userLogin,
                     "orderPaymentPreferenceId", paymentPreference.get("orderPaymentPreferenceId"), "comments", comment));
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Failed to execute service createPaymentFromPreference", module);
+            Debug.logError(e, "Failed to execute service createPaymentFromPreference", MODULE);
             request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resourceErr, "worldPayEvents.failedToExecuteServiceCreatePaymentFromPreference", locale));
             return false;
         }
 
         if (ServiceUtil.isError(results)) {
-            Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), module);
+            Debug.logError((String) results.get(ModelService.ERROR_MESSAGE), MODULE);
             request.setAttribute("_ERROR_MESSAGE_", results.get(ModelService.ERROR_MESSAGE));
             return false;
         }
@@ -504,7 +504,7 @@ public class WorldPayEvents {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
         } else {
             String value = EntityUtilProperties.getPropertyValue(resource, parameterName, delegator);
diff --git a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
index 0dbd4fd..1fba736 100644
--- a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
+++ b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/util/UtilAccounting.java
@@ -37,7 +37,7 @@ import org.apache.ofbiz.entity.util.EntityQuery;
 
 public final class UtilAccounting {
     
-    public static final String module = UtilAccounting.class.getName();
+    public static final String MODULE = UtilAccounting.class.getName();
 
     private UtilAccounting() {}
 
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
index 5c4d386..e923884 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementEvents.java
@@ -51,7 +51,7 @@ import org.apache.ofbiz.webapp.website.WebSiteWorker;
  */
 public class ContentManagementEvents {
 
-    public static final String module = ContentManagementEvents.class.getName();
+    public static final String MODULE = ContentManagementEvents.class.getName();
 
     public static String updateStaticValues(HttpServletRequest request, HttpServletResponse response) {
         HttpSession session = request.getSession();
@@ -75,7 +75,7 @@ public class ContentManagementEvents {
             permittedPublishPointList = ContentManagementWorker.getPermittedPublishPoints(delegator, allPublishPointList, userLogin, security, "_ADMIN", null, null);
             valueList = ContentManagementWorker.getStaticValues(delegator, parentPlaceholderId, permittedPublishPointList);
         } catch (GeneralException e) {
-            Debug.logError(e.getMessage(), module);
+            Debug.logError(e.getMessage(), MODULE);
             request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
             return "error";
         }
@@ -102,7 +102,7 @@ public class ContentManagementEvents {
                                 if (ServiceUtil.isError(result)) {
                                     String errorMessage = ServiceUtil.getErrorMessage(result);
                                     request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                                    Debug.logError(errorMessage, module);
+                                    Debug.logError(errorMessage, MODULE);
                                     return "error";
                                 }
                             } else if ("N".equalsIgnoreCase(paramValue) && "Y".equalsIgnoreCase(pubValue)) {
@@ -113,7 +113,7 @@ public class ContentManagementEvents {
                                 if (ServiceUtil.isError(result)) {
                                     String errorMessage = ServiceUtil.getErrorMessage(result);
                                     request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                                    Debug.logError(errorMessage, module);
+                                    Debug.logError(errorMessage, MODULE);
                                     return "error";
                                 }
                             }
@@ -127,13 +127,13 @@ public class ContentManagementEvents {
                                 if (ServiceUtil.isError(result)) {
                                     String errorMessage = ServiceUtil.getErrorMessage(result);
                                     request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                                    Debug.logError(errorMessage, module);
+                                    Debug.logError(errorMessage, MODULE);
                                     return "error";
                                 }
                         }
                     }
                 } catch (GenericServiceException e) {
-                    Debug.logError(e.getMessage(), module);
+                    Debug.logError(e.getMessage(), MODULE);
                     request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
                     return "error";
                 }
@@ -261,7 +261,7 @@ public class ContentManagementEvents {
                         if (ServiceUtil.isError(result)) {
                             String errorMessage = ServiceUtil.getErrorMessage(result);
                             request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                            Debug.logError(errorMessage, module);
+                            Debug.logError(errorMessage, MODULE);
                             return "error";
                         }
 
@@ -279,7 +279,7 @@ public class ContentManagementEvents {
                         if (ServiceUtil.isError(result)) {
                             String errorMessage = ServiceUtil.getErrorMessage(result);
                             request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                            Debug.logError(errorMessage, module);
+                            Debug.logError(errorMessage, MODULE);
                             return "error";
                         }
                         if (!statusIdUpdated) {
@@ -289,7 +289,7 @@ public class ContentManagementEvents {
                                 targContent.store();
                                 statusIdUpdated = true;
                             } catch (GenericEntityException e) {
-                                Debug.logError(e.getMessage(), module);
+                                Debug.logError(e.getMessage(), MODULE);
                                 request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
                                 return "error";
                             }
@@ -309,11 +309,11 @@ public class ContentManagementEvents {
                     }
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e.getMessage(), module);
+                Debug.logError(e.getMessage(), MODULE);
                 request.setAttribute("_ERROR_MESSAGE_", e.getMessage());
                 return "error";
             } catch (GenericServiceException e2) {
-                Debug.logError(e2, module);
+                Debug.logError(e2, MODULE);
                 request.setAttribute("_ERROR_MESSAGE_", e2.getMessage());
                 return "error";
             }
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
index 301c471..b19d5f9 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementServices.java
@@ -62,7 +62,7 @@ import com.ibm.icu.util.Calendar;
  */
 public class ContentManagementServices {
 
-    public static final String module = ContentManagementServices.class.getName();
+    public static final String MODULE = ContentManagementServices.class.getName();
     public static final String resource = "ContentUiLabels";
 
     /**
@@ -152,7 +152,7 @@ public class ContentManagementServices {
         String deactivateString = (String) context.get("deactivateExisting");
         boolean deactivateExisting = "true".equalsIgnoreCase(deactivateString);
 
-        if (Debug.infoOn()) Debug.logInfo("in persist... mapKey(0):" + mapKey, module);
+        if (Debug.infoOn()) Debug.logInfo("in persist... mapKey(0):" + mapKey, MODULE);
 
         // ContentPurposes can get passed in as a delimited string or a list. Combine.
         List<String> contentPurposeList = UtilGenerics.cast(context.get("contentPurposeList"));
@@ -168,8 +168,8 @@ public class ContentManagementServices {
         context.put("contentPurposeString", null);
         
         if (Debug.infoOn()) {
-            Debug.logInfo("in persist... contentPurposeList(0):" + contentPurposeList, module);
-            Debug.logInfo("in persist... textData(0):" + context.get("textData"), module);
+            Debug.logInfo("in persist... contentPurposeList(0):" + contentPurposeList, MODULE);
+            Debug.logInfo("in persist... textData(0):" + context.get("textData"), MODULE);
         }
 
         GenericValue content = delegator.makeValue("Content");
@@ -182,7 +182,7 @@ public class ContentManagementServices {
         String origDataResourceId = (String) content.get("dataResourceId");
         
         if (Debug.infoOn()) {
-            Debug.logInfo("in persist... contentId(0):" + contentId, module);
+            Debug.logInfo("in persist... contentId(0):" + contentId, MODULE);
         }
 
         GenericValue dataResource = delegator.makeValue("DataResource");
@@ -197,7 +197,7 @@ public class ContentManagementServices {
         String dataResourceId = (String) dataResource.get("dataResourceId");
         String dataResourceTypeId = (String) dataResource.get("dataResourceTypeId");
         if (Debug.infoOn()) {
-            Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module);
+            Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, MODULE);
         }
 
         GenericValue contentAssoc = delegator.makeValue("ContentAssoc");
@@ -229,20 +229,20 @@ public class ContentManagementServices {
         GenericValue userLogin = (GenericValue) context.get("userLogin");
         boolean dataResourceExists = true;
         if (Debug.infoOn()) {
-            Debug.logInfo("in persist... dataResourceTypeId(0):" + dataResourceTypeId, module);
+            Debug.logInfo("in persist... dataResourceTypeId(0):" + dataResourceTypeId, MODULE);
         }
         if (UtilValidate.isNotEmpty(dataResourceTypeId)) {
             Map<String, Object> dataResourceResult;
             try {
                 dataResourceResult = persistDataResourceAndDataMethod(dctx, context);
             } catch (GenericServiceException e) {
-                Debug.logError(e, e.toString(), module);
+                Debug.logError(e, e.toString(), MODULE);
                 return ServiceUtil.returnError(e.toString());
             } catch (GenericEntityException e) {
-                Debug.logError(e, e.toString(), module);
+                Debug.logError(e, e.toString(), MODULE);
                 return ServiceUtil.returnError(e.toString());
             } catch (Exception e) {
-                Debug.logError(e, e.toString(), module);
+                Debug.logError(e, e.toString(), MODULE);
                 return ServiceUtil.returnError(e.toString());
             }
             String errorMsg = ServiceUtil.getErrorMessage(dataResourceResult);
@@ -261,7 +261,7 @@ public class ContentManagementServices {
         context.put("skipPermissionCheck", null);  // Force check here
         boolean contentExists = true;
         if (Debug.infoOn()) {
-            Debug.logInfo("in persist... contentTypeId:" +  contentTypeId + " dataResourceTypeId:" + dataResourceTypeId + " contentId:" + contentId + " dataResourceId:" + dataResourceId, module);
+            Debug.logInfo("in persist... contentTypeId:" +  contentTypeId + " dataResourceTypeId:" + dataResourceTypeId + " contentId:" + contentId + " dataResourceId:" + dataResourceId, MODULE);
         }
         if (UtilValidate.isNotEmpty(contentTypeId)) {
             if (UtilValidate.isEmpty(contentId)) {
@@ -282,7 +282,7 @@ public class ContentManagementServices {
                 contentContext.put("userLogin", userLogin);
                 contentContext.put("displayFailCond", bDisplayFailCond);
                 contentContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
-                Debug.logInfo("In persistContentAndAssoc calling updateContent with content: " + contentContext, module);
+                Debug.logInfo("In persistContentAndAssoc calling updateContent with content: " + contentContext, MODULE);
                 Map<String, Object> thisResult = dispatcher.runSync("updateContent", contentContext);
                 if (ServiceUtil.isError(thisResult) || ServiceUtil.isFailure(thisResult)) {
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentContentUpdatingError", UtilMisc.toMap("serviceName", "persistContentAndAssoc"), locale), null, null, thisResult);
@@ -294,7 +294,7 @@ public class ContentManagementServices {
                 contentContext.put("userLogin", userLogin);
                 contentContext.put("displayFailCond", bDisplayFailCond);
                 contentContext.put("skipPermissionCheck", context.get("skipPermissionCheck"));
-                Debug.logInfo("In persistContentAndAssoc calling createContent with content: " + contentContext, module);
+                Debug.logInfo("In persistContentAndAssoc calling createContent with content: " + contentContext, MODULE);
                 Map<String, Object> thisResult = dispatcher.runSync("createContent", contentContext);
                 if (ServiceUtil.isError(thisResult) || ServiceUtil.isFailure(thisResult)) {
                     return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentContentCreatingError", UtilMisc.toMap("serviceName", "persistContentAndAssoc"), locale), null, null, thisResult);
@@ -325,7 +325,7 @@ public class ContentManagementServices {
                 map.put("userLogin", userLogin);
                 map.put("dataResourceId", dataResourceId);
                 map.put("contentId", contentId);
-                if (Debug.infoOn()) Debug.logInfo("in persist... context:" + context, module);
+                if (Debug.infoOn()) Debug.logInfo("in persist... context:" + context, MODULE);
                 Map<String, Object> r = dispatcher.runSync("updateContent", map);
                 boolean isError = ModelService.RESPOND_ERROR.equals(r.get(ModelService.RESPONSE_MESSAGE));
                 if (isError)
@@ -339,12 +339,12 @@ public class ContentManagementServices {
         }
         // If parentContentIdTo or parentContentIdFrom exists, create association with newly created content
         if (Debug.infoOn()) {
-            Debug.logInfo("CREATING contentASSOC contentAssocTypeId:" + contentAssocTypeId, module);
+            Debug.logInfo("CREATING contentASSOC contentAssocTypeId:" + contentAssocTypeId, MODULE);
         }
         // create content assoc if the key values are present....
-        if (Debug.infoOn()) Debug.logInfo("contentAssoc: " + contentAssoc.toString(), module);
+        if (Debug.infoOn()) Debug.logInfo("contentAssoc: " + contentAssoc.toString(), MODULE);
         if (UtilValidate.isNotEmpty(contentAssocTypeId) && contentAssoc.get("contentId") != null && contentAssoc.get("contentIdTo") != null) {
-            if (Debug.infoOn()) Debug.logInfo("in persistContentAndAssoc, deactivateExisting:" + deactivateExisting, module);
+            if (Debug.infoOn()) Debug.logInfo("in persistContentAndAssoc, deactivateExisting:" + deactivateExisting, MODULE);
             Map<String, Object> contentAssocContext = new HashMap<>();
             contentAssocContext.put("userLogin", userLogin);
             contentAssocContext.put("displayFailCond", bDisplayFailCond);
@@ -394,7 +394,7 @@ public class ContentManagementServices {
         context.put("contentId", origContentId);
         context.put("dataResourceId", origDataResourceId);
         context.remove("dataResource");
-        Debug.logInfo("results:" + results, module);
+        Debug.logInfo("results:" + results, MODULE);
         return results;
     }
 
@@ -425,20 +425,20 @@ public class ContentManagementServices {
           serviceContext.put("partyId", partyId);
           serviceContext.put("contentId", siteContentId);
           serviceContext.put("userLogin", userLogin);
-          Debug.logInfo("updateSiteRoles, serviceContext(0):" + serviceContext, module);
+          Debug.logInfo("updateSiteRoles, serviceContext(0):" + serviceContext, MODULE);
           String siteRole = (String)roleType.get("roleTypeId"); // BLOG_EDITOR, BLOG_ADMIN, etc.
           String cappedSiteRole = ModelUtil.dbNameToVarName(siteRole);
           if (Debug.infoOn()) {
-              Debug.logInfo("updateSiteRoles, cappediteRole(1):" + cappedSiteRole, module);
+              Debug.logInfo("updateSiteRoles, cappediteRole(1):" + cappedSiteRole, MODULE);
           }
           String siteRoleVal = (String)context.get(cappedSiteRole);
           if (Debug.infoOn()) {
-              Debug.logInfo("updateSiteRoles, siteRoleVal(1):" + siteRoleVal, module);
-              Debug.logInfo("updateSiteRoles, context(1):" + context, module);
+              Debug.logInfo("updateSiteRoles, siteRoleVal(1):" + siteRoleVal, MODULE);
+              Debug.logInfo("updateSiteRoles, context(1):" + context, MODULE);
           }
           Object fromDate = context.get(cappedSiteRole + "FromDate");
           if (Debug.infoOn()) {
-              Debug.logInfo("updateSiteRoles, fromDate(1):" + fromDate, module);
+              Debug.logInfo("updateSiteRoles, fromDate(1):" + fromDate, MODULE);
           }
           serviceContext.put("roleTypeId", siteRole);
           if (siteRoleVal != null && "Y".equalsIgnoreCase(siteRoleVal)) {
@@ -455,16 +455,16 @@ public class ContentManagementServices {
                           return ServiceUtil.returnError(ServiceUtil.getErrorMessage(permResults));
                       }
                       serviceContext.put("fromDate", UtilDateTime.nowTimestamp());
-                      if (Debug.infoOn()) Debug.logInfo("updateSiteRoles, serviceContext(1):" + serviceContext, module);
+                      if (Debug.infoOn()) Debug.logInfo("updateSiteRoles, serviceContext(1):" + serviceContext, MODULE);
                       permResults = dispatcher.runSync("createContentRole", serviceContext);
                       if (ServiceUtil.isError(permResults)) {
                           return ServiceUtil.returnError(ServiceUtil.getErrorMessage(permResults));
                       } 
                   } catch (GenericServiceException e) {
-                      Debug.logError(e, e.toString(), module);
+                      Debug.logError(e, e.toString(), MODULE);
                       return ServiceUtil.returnError(e.toString());
                   } catch (Exception e2) {
-                      Debug.logError(e2, e2.toString(), module);
+                      Debug.logError(e2, e2.toString(), MODULE);
                       return ServiceUtil.returnError(e2.toString());
                   }
               }
@@ -472,7 +472,7 @@ public class ContentManagementServices {
               if (fromDate != null) {
                   // for now, will assume that any error is due to non-existence - ignore
                   try {
-                      Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, module);
+                      Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, MODULE);
                       Map<String, Object> newContext = new HashMap<>();
                       newContext.put("contentId", serviceContext.get("contentId"));
                       newContext.put("partyId", serviceContext.get("partyId"));
@@ -483,10 +483,10 @@ public class ContentManagementServices {
                           return ServiceUtil.returnError(ServiceUtil.getErrorMessage(permResults));
                       }
                   } catch (GenericServiceException e) {
-                      Debug.logError(e, e.toString(), module);
+                      Debug.logError(e, e.toString(), MODULE);
                       return ServiceUtil.returnError(e.toString());
                   } catch (Exception e2) {
-                      Debug.logError(e2, e2.toString(), module);
+                      Debug.logError(e2, e2.toString(), MODULE);
                       return ServiceUtil.returnError(e2.toString());
                   }
               }
@@ -514,13 +514,13 @@ public class ContentManagementServices {
               return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentContentNoAccessToUploadImage", locale));
           }
       } catch (GenericServiceException e) {
-          Debug.logError(e, e.toString(), module);
+          Debug.logError(e, e.toString(), MODULE);
           return ServiceUtil.returnError(e.toString());
       } catch (GenericEntityException e) {
-          Debug.logError(e, e.toString(), module);
+          Debug.logError(e, e.toString(), MODULE);
           return ServiceUtil.returnError(e.toString());
       } catch (Exception e) {
-          Debug.logError(e, e.toString(), module);
+          Debug.logError(e, e.toString(), MODULE);
           return ServiceUtil.returnError(e.toString());
       }
       String errorMsg = ServiceUtil.getErrorMessage(result);
@@ -551,7 +551,7 @@ public class ContentManagementServices {
       String dataResourceId = (String)dataResource.get("dataResourceId");
       String dataResourceTypeId = (String)dataResource.get("dataResourceTypeId");
       if (Debug.infoOn()) {
-          Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module);
+          Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, MODULE);
       }
       context.put("skipPermissionCheck", "granted"); // TODO: a temp hack because I don't want to bother with DataResource permissions at this time.
       boolean dataResourceExists = true;
@@ -591,7 +591,7 @@ public class ContentManagementServices {
           }
           dataResourceId = (String)thisResult.get("dataResourceId");
           if (Debug.infoOn()) {
-              Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, module);
+              Debug.logInfo("in persist... dataResourceId(0):" + dataResourceId, MODULE);
           }
           dataResource = (GenericValue)thisResult.get("dataResource");
           Map<String, Object> fileContext = new HashMap<>();
@@ -688,7 +688,7 @@ public class ContentManagementServices {
             serviceContext.put("contentId", partyUserLoginId); // author contentId
             result = dispatcher.runSync("createContentRole", serviceContext);
             if (ServiceUtil.isError(result)) {
-                Debug.logError(ServiceUtil.getErrorMessage(result), module);
+                Debug.logError(ServiceUtil.getErrorMessage(result), MODULE);
             }
         }
     }
@@ -728,7 +728,7 @@ public class ContentManagementServices {
                     try {
                         serviceContext.put("fromDate", UtilDateTime.nowTimestamp());
                         if (Debug.infoOn()) {
-                            Debug.logInfo("updateSiteRoles, serviceContext(1):" + serviceContext, module);
+                            Debug.logInfo("updateSiteRoles, serviceContext(1):" + serviceContext, MODULE);
                         }
                         addRoleToUser(delegator, dispatcher, serviceContext);
                         thisResult = dispatcher.runSync("createContentRole", serviceContext);
@@ -736,9 +736,9 @@ public class ContentManagementServices {
                             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
                         }
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, e.toString(), module);
+                        Debug.logError(e, e.toString(), MODULE);
                     } catch (Exception e2) {
-                        Debug.logError(e2, e2.toString(), module);
+                        Debug.logError(e2, e2.toString(), MODULE);
                     }
                 }
             } else {
@@ -746,7 +746,7 @@ public class ContentManagementServices {
                     // for now, will assume that any error is due to non-existence - ignore
                     //return ServiceUtil.returnError(e.toString());
                     try {
-                        Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, module);
+                        Debug.logInfo("updateSiteRoles, serviceContext(2):" + serviceContext, MODULE);
                         Map<String, Object> newContext = new HashMap<>();
                         newContext.put("contentId", serviceContext.get("contentId"));
                         newContext.put("partyId", serviceContext.get("partyId"));
@@ -756,9 +756,9 @@ public class ContentManagementServices {
                             return ServiceUtil.returnError(ServiceUtil.getErrorMessage(thisResult));
                         }
                     } catch (GenericServiceException e) {
-                        Debug.logError(e, e.toString(), module);
+                        Debug.logError(e, e.toString(), MODULE);
                     } catch (Exception e2) {
-                        Debug.logError(e2, e2.toString(), module);
+                        Debug.logError(e2, e2.toString(), MODULE);
                     }
                 }
             }
@@ -787,34 +787,34 @@ public class ContentManagementServices {
         }
         boolean doLink = (action != null && "Y".equalsIgnoreCase(action)) ? true : false;
         if (Debug.infoOn()) {
-            Debug.logInfo("in updateOrRemove, context:" + context, module);
+            Debug.logInfo("in updateOrRemove, context:" + context, MODULE);
         }
         try {
             GenericValue entityValuePK = delegator.makeValue(entityName, pkFields);
             if (Debug.infoOn()) {
-                Debug.logInfo("in updateOrRemove, entityValuePK:" + entityValuePK, module);
+                Debug.logInfo("in updateOrRemove, entityValuePK:" + entityValuePK, MODULE);
             }
             GenericValue entityValueExisting = EntityQuery.use(delegator).from(entityName).where(entityValuePK).cache().queryOne();
             if (Debug.infoOn()) {
-                Debug.logInfo("in updateOrRemove, entityValueExisting:" + entityValueExisting, module);
+                Debug.logInfo("in updateOrRemove, entityValueExisting:" + entityValueExisting, MODULE);
             }
             if (entityValueExisting == null) {
                 if (doLink) {
                     entityValuePK.create();
                     if (Debug.infoOn()) {
-                        Debug.logInfo("in updateOrRemove, entityValuePK: CREATED", module);
+                        Debug.logInfo("in updateOrRemove, entityValuePK: CREATED", MODULE);
                     }
                 }
             } else {
                 if (!doLink) {
                     entityValueExisting.remove();
                     if (Debug.infoOn()) {
-                        Debug.logInfo("in updateOrRemove, entityValueExisting: REMOVED", module);
+                        Debug.logInfo("in updateOrRemove, entityValueExisting: REMOVED", MODULE);
                     }
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return results;
@@ -894,7 +894,7 @@ public class ContentManagementServices {
                 seqNum += seqIncrement;
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return result;
@@ -912,7 +912,7 @@ public class ContentManagementServices {
         try {
             GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
             if (content == null) {
-                Debug.logError("content was null", module);
+                Debug.logError("content was null", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentNoContentFound", UtilMisc.toMap("contentId", ""), locale));
             }
             String dataResourceId = content.getString("dataResourceId");
@@ -952,7 +952,7 @@ public class ContentManagementServices {
             }
 
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return result;
@@ -970,7 +970,7 @@ public class ContentManagementServices {
             int leafCount = ContentManagementWorker.updateStatsTopDown(delegator, startContentId, typeList);
             result.put("leafCount", leafCount);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return result;
@@ -1017,7 +1017,7 @@ public class ContentManagementServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
 
@@ -1063,7 +1063,7 @@ public class ContentManagementServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return results;
@@ -1109,7 +1109,7 @@ public class ContentManagementServices {
             context.put("visitedSet", visitedSet);
         } else {
             if (visitedSet.contains(contentId)) {
-                Debug.logWarning("visitedSet already contains:" + contentId, module);
+                Debug.logWarning("visitedSet already contains:" + contentId, MODULE);
                 return;
             } else {
                 visitedSet.add(contentId);
@@ -1132,7 +1132,7 @@ public class ContentManagementServices {
             context.put("visitedSet", visitedSet);
         } else {
             if (visitedSet.contains(contentId)) {
-                Debug.logWarning("visitedSet already contains:" + contentId, module);
+                Debug.logWarning("visitedSet already contains:" + contentId, MODULE);
                 return;
             } else {
                 visitedSet.add(contentId);
@@ -1178,7 +1178,7 @@ public class ContentManagementServices {
                      .queryList();
              results.put("_LIST_", lst);
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return results;
@@ -1350,7 +1350,7 @@ public class ContentManagementServices {
         } else if ("TF_yr".equals(useTimeUomId)) {
             field = Calendar.YEAR;
         } else {
-            Debug.logWarning("Don't know anything about useTimeUomId [" + useTimeUomId + "], defaulting to month", module);
+            Debug.logWarning("Don't know anything about useTimeUomId [" + useTimeUomId + "], defaulting to month", MODULE);
         }
         calendar.add(field, useTime);
         thruDate = new Timestamp(calendar.getTimeInMillis());
@@ -1401,12 +1401,12 @@ public class ContentManagementServices {
                 productContent = lst.get(0);
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e.toString(), module);
+            Debug.logError(e.toString(), MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         if (productContent == null) {
             String msg = UtilProperties.getMessage(resource, "ContentNoProductContentFound", UtilMisc.toMap("productId", productId), locale);
-            Debug.logError(msg, module);
+            Debug.logError(msg, MODULE);
             return ServiceUtil.returnError(msg);
         }
         Long useTime = (Long) productContent.get("useTime");
@@ -1435,7 +1435,7 @@ public class ContentManagementServices {
         LocalDispatcher dispatcher = dctx.getDispatcher();
         String orderId = (String) context.get("orderId");
 
-        Debug.logInfo("In updateContentSubscriptionByOrder service with orderId: " + orderId, module);
+        Debug.logInfo("In updateContentSubscriptionByOrder service with orderId: " + orderId, MODULE);
 
         GenericValue orderHeader = null;
         try {
@@ -1476,7 +1476,7 @@ public class ContentManagementServices {
                 }
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e.toString(), module);
+            Debug.logError(e.toString(), MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return result;
@@ -1510,7 +1510,7 @@ public class ContentManagementServices {
             GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
             result = followNodeChildrenMethod(content, dispatcher, serviceName, ctx);
         } catch (GenericEntityException e) {
-            Debug.logError(e.toString(), module);
+            Debug.logError(e.toString(), MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return result;
@@ -1526,7 +1526,7 @@ public class ContentManagementServices {
             context.put("visitedSet", visitedSet);
         } else {
             if (visitedSet.contains(contentId)) {
-                Debug.logWarning("visitedSet already contains:" + contentId, module);
+                Debug.logWarning("visitedSet already contains:" + contentId, MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentVisitedSet", locale) + contentId);
             } else {
                 visitedSet.add(contentId);
@@ -1560,7 +1560,7 @@ public class ContentManagementServices {
           try {
               dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", oldDataResourceId).queryOne();
           } catch (GenericEntityException e) {
-              Debug.logError(e.toString(), module);
+              Debug.logError(e.toString(), MODULE);
               return ServiceUtil.returnError(e.toString());
           }
       }
@@ -1607,7 +1607,7 @@ public class ContentManagementServices {
               }
           }
       } catch (GenericServiceException e) {
-          Debug.logError(e.toString(), module);
+          Debug.logError(e.toString(), MODULE);
           return ServiceUtil.returnError(e.toString());
       }
       return result;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
index 164ac25..654d3d3 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ContentManagementWorker.java
@@ -60,7 +60,7 @@ import org.apache.ofbiz.security.Security;
  */
 public final class ContentManagementWorker {
 
-    public static final String module = ContentManagementWorker.class.getName();
+    public static final String MODULE = ContentManagementWorker.class.getName();
     private static Map<String, GenericValue> cachedWebSitePublishPoints = new HashMap<>();
     private static Map<String, Map<String, Object>> cachedStaticValues = new HashMap<>();
 
@@ -106,7 +106,7 @@ public final class ContentManagementWorker {
             lookupCaches.put(cacheEntityName, lkupCache);
         }
         lkupCache.add(pk.getPrimaryKey());
-        if (Debug.infoOn()) Debug.logInfo("in mruAddByEntityName, entityName:" + entityName + " lifoSet.size()" + lkupCache.size(), module);
+        if (Debug.infoOn()) Debug.logInfo("in mruAddByEntityName, entityName:" + entityName + " lifoSet.size()" + lkupCache.size(), MODULE);
     }
 
     public static Iterator<Object> mostRecentlyViewedIterator(String entityName, Map<String, LifoSet<Object>> lookupCaches) {
@@ -270,7 +270,7 @@ public final class ContentManagementWorker {
             try {
                 currentValue = EntityQuery.use(delegator).from(currentPK.getEntityName()).where(currentPK).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e.getMessage(), module);
+                Debug.logError(e.getMessage(), MODULE);
             }
             request.setAttribute("currentValue", currentValue);
         }
@@ -545,7 +545,7 @@ public final class ContentManagementWorker {
                 authorContent.setNonPKFields(value);
             }
         } catch (GenericEntityException | MiniLangException e) {
-            Debug.logError(e.getMessage(), module);
+            Debug.logError(e.getMessage(), MODULE);
         }
 
         return authorContent;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
index f654df8..b97282f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/ConvertTree.java
@@ -42,7 +42,7 @@ import org.apache.ofbiz.service.LocalDispatcher;
 import org.apache.ofbiz.service.ServiceUtil;
 
 public class ConvertTree{
-    public static final String module = ConvertTree.class.getName();
+    public static final String MODULE = ConvertTree.class.getName();
 
 /*
 
@@ -222,7 +222,7 @@ In order to make this service active add the following to the service definition
                 sucMsg = UtilProperties.getMessage("ContentUiLabels", "ContentConvertDocumentsTreeSuccessful", UtilMisc.toMap("counterLine", counterLine), locale);
             } catch (IOException | GenericServiceException | GenericEntityException e) {
                 errMsg = "Exception " + UtilMisc.toMap("errMessage", e.toString());
-                Debug.logError(e, errMsg, module);
+                Debug.logError(e, errMsg, MODULE);
                 return ServiceUtil.returnError(errMsg);
             }
         }
@@ -369,11 +369,11 @@ In order to make this service active add the following to the service definition
             return ServiceUtil.returnSuccess(sucMsg);
         } catch (GenericEntityException e) {
             errMsg = "GenericEntityException "+ UtilMisc.toMap("errMessage", e.toString());
-            Debug.logError(e, errMsg, module);
+            Debug.logError(e, errMsg, MODULE);
             return ServiceUtil.returnError(errMsg);
         } catch (GenericServiceException e) {
             errMsg = "GenericServiceException"+ UtilMisc.toMap("errMessage", e.toString());
-            Debug.logError(e, errMsg, module);
+            Debug.logError(e, errMsg, MODULE);
             return ServiceUtil.returnError(errMsg);
         }
     }
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
index 92d991d..d004f74 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/blog/BlogRssServices.java
@@ -51,7 +51,7 @@ import com.sun.syndication.feed.synd.SyndFeedImpl;
  */
 public class BlogRssServices {
 
-    public static final String module = BlogRssServices.class.getName();
+    public static final String MODULE = BlogRssServices.class.getName();
     public static final String resource = "ContentUiLabels";
     public static final String mimeTypeId = "text/html";
     public static final String mapKey = "SUMMARY";
@@ -75,7 +75,7 @@ public class BlogRssServices {
         try {
             content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (content == null) {
@@ -109,7 +109,7 @@ public class BlogRssServices {
                            "statusId", "CTNT_PUBLISHED")
                     .orderBy("-caFromDate").queryList();
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (contentRecs != null) {
@@ -119,9 +119,9 @@ public class BlogRssServices {
                     Map<String, Object> dummy = new HashMap<>();
                     sub = ContentWorker.renderSubContentAsText(dispatcher, v.getString("contentId"), mapKey, dummy, locale, mimeTypeId, true);
                 } catch (GeneralException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 } catch (IOException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 }
                 if (sub != null) {
                     String thisLink = entryLink + "?articleContentId=" + v.getString("contentId") + "&blogContentId=" + contentId;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
index 0b8ca1a..291874d 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/cms/CmsEvents.java
@@ -59,7 +59,7 @@ import freemarker.template.TemplateException;
  */
 public class CmsEvents {
 
-    public static final String module = CmsEvents.class.getName();
+    public static final String MODULE = CmsEvents.class.getName();
 
     public static String cms(HttpServletRequest request, HttpServletResponse response) {
         Delegator delegator = (Delegator) request.getAttribute("delegator");
@@ -113,7 +113,7 @@ public class CmsEvents {
                     return "error";
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             } catch (IOException e) {
                 throw new GeneralRuntimeException("Error in the response writer/output stream while rendering content.", e);
             } catch (GeneralException e) {
@@ -145,7 +145,7 @@ public class CmsEvents {
                         .where("webSiteId", webSiteId, "webSiteContentTypeId", "DEFAULT_PAGE")
                         .orderBy("-fromDate").filterByDate().cache().queryFirst();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (defaultContent != null) {
                 pathInfo = defaultContent.getString("contentId");
@@ -167,7 +167,7 @@ public class CmsEvents {
             try {
                 pathAlias = EntityQuery.use(delegator).from("WebSitePathAlias").where("webSiteId", webSiteId, "pathAlias", pathInfo).orderBy("-fromDate").cache().filterByDate().queryFirst();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (pathAlias != null) {
                 String alias = pathAlias.getString("aliasTo");
@@ -198,9 +198,9 @@ public class CmsEvents {
 
             // get the contentId/mapKey from URL
             if (contentId == null) {
-                if (Debug.verboseOn()) Debug.logVerbose("Current PathInfo: " + pathInfo, module);
+                if (Debug.verboseOn()) Debug.logVerbose("Current PathInfo: " + pathInfo, MODULE);
                 String[] pathSplit = pathInfo.split("/");
-                if (Debug.verboseOn()) Debug.logVerbose("Split pathinfo: " + pathSplit.length, module);
+                if (Debug.verboseOn()) Debug.logVerbose("Split pathinfo: " + pathSplit.length, MODULE);
                 contentId = pathSplit[0];
                 if (pathSplit.length > 1) {
                     mapKey = pathSplit[1];
@@ -216,7 +216,7 @@ public class CmsEvents {
                 try {
                     statusCode = verifyContentToWebSite(delegator, webSiteId, contentId);
                 } catch (GeneralException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                     throw new GeneralRuntimeException(e.getMessage(), e);
                 }
             } else {
@@ -231,11 +231,11 @@ public class CmsEvents {
                             .where("webSiteId", webSiteId, "webSiteContentTypeId", "ERROR_ROOT")
                             .orderBy("fromDate").filterByDate().cache().queryFirst();
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 }
 
                 if (errorContainer != null) {
-                    if (Debug.verboseOn()) Debug.logVerbose("Found error containers: " + errorContainer, module);
+                    if (Debug.verboseOn()) Debug.logVerbose("Found error containers: " + errorContainer, MODULE);
 
                     GenericValue errorPage = null;
                     try {
@@ -246,16 +246,16 @@ public class CmsEvents {
                                         "caMapKey", String.valueOf(statusCode))
                                 .filterByDate().queryFirst();
                     } catch (GenericEntityException e) {
-                        Debug.logError(e, module);
+                        Debug.logError(e, MODULE);
                     }
                     if (errorPage != null) {
                         if (Debug.verboseOn()) {
-                             Debug.logVerbose("Found error pages " + statusCode + " : " + errorPage, module);
+                             Debug.logVerbose("Found error pages " + statusCode + " : " + errorPage, MODULE);
                         }
                         contentId = errorPage.getString("contentId");
                     } else {
                         if (Debug.verboseOn()) {
-                             Debug.logVerbose("No specific error page, falling back to the Error Container for " + statusCode, module);
+                             Debug.logVerbose("No specific error page, falling back to the Error Container for " + statusCode, MODULE);
                         }
                         contentId = errorContainer.getString("contentId");
                     }
@@ -267,13 +267,13 @@ public class CmsEvents {
                     try {
                         GenericValue errorPage = EntityQuery.use(delegator).from("Content").where("contentId", "CONTENT_ERROR_" + statusCode).cache().queryOne();
                         if (errorPage != null) {
-                            if (Debug.verboseOn()) Debug.logVerbose("Found generic page " + statusCode, module);
+                            if (Debug.verboseOn()) Debug.logVerbose("Found generic page " + statusCode, MODULE);
                             contentId = errorPage.getString("contentId");
                             mapKey = null;
                             hasErrorPage = true;
                         }
                     } catch (GenericEntityException e) {
-                        Debug.logError(e, module);
+                        Debug.logError(e, MODULE);
                     }
                 }
 
@@ -338,7 +338,7 @@ public class CmsEvents {
                     }
                     siteName = EntityQuery.use(delegator).from("WebSite").where("webSiteId", webSiteId).cache().queryOne().getString("siteName");
                 } catch (GenericEntityException e) {
-                    Debug.logError(e, module);
+                    Debug.logError(e, MODULE);
                 }
                 request.setAttribute("_ERROR_MESSAGE_", "Content: " + contentName + " [" + contentId + "] is not a publish point for the current website: " + siteName + " [" + webSiteId + "]");
                 return "error";
@@ -356,7 +356,7 @@ public class CmsEvents {
                 siteName = "Not specified";
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
         if (webSite != null) {
             request.setAttribute("_ERROR_MESSAGE_", "Not able to find a page to display for website: " + siteName + " [" + webSiteId + "] not even a default page!");
@@ -382,7 +382,7 @@ public class CmsEvents {
         }
         publishPoints = EntityUtil.filterByDate(publishPoints);
         if (UtilValidate.isNotEmpty(publishPoints)) {
-            if (Debug.verboseOn()) Debug.logVerbose("Found publish points: " + publishPoints, module);
+            if (Debug.verboseOn()) Debug.logVerbose("Found publish points: " + publishPoints, MODULE);
             return HttpServletResponse.SC_OK;
         } else {
             // the passed in contentId is not a publish point for the web site;
@@ -408,7 +408,7 @@ public class CmsEvents {
         } else {
             responseCode = HttpServletResponse.SC_NOT_FOUND;
         }
-        Debug.logWarning("Could not verify contentId [" + contentId + "] to webSiteId [" + webSiteId + "], returning code: " + responseCode, module);
+        Debug.logWarning("Could not verify contentId [" + contentId + "] to webSiteId [" + webSiteId + "], returning code: " + responseCode, MODULE);
         return responseCode;
     }
 
@@ -435,7 +435,7 @@ public class CmsEvents {
                 }
             }
         } else {
-            if (Debug.verboseOn()) Debug.logVerbose("Found assocs: " + contentAssoc, module);
+            if (Debug.verboseOn()) Debug.logVerbose("Found assocs: " + contentAssoc, MODULE);
             return HttpServletResponse.SC_OK;
         }
         if (hadContent) return HttpServletResponse.SC_GONE;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java
index 9c3656d..3e68a7f 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocEvents.java
@@ -52,7 +52,7 @@ import org.apache.ofbiz.webapp.website.WebSiteWorker;
  * CompDocEvents Class
  */
 public class CompDocEvents {
-    public static final String module = CompDocEvents.class.getName();
+    public static final String MODULE = CompDocEvents.class.getName();
 
     /**
      *
@@ -80,7 +80,7 @@ public class CompDocEvents {
             try {
                 EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Error running serviceName persistContentAndAssoc", module);
+                Debug.logError(e, "Error running serviceName persistContentAndAssoc", MODULE);
                 String errMsg = UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.error_modelservice_for_srv_name", locale);
                 request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg + " [" + "persistContentAndAssoc" + "]: " + e.toString());
                 return "error";
@@ -92,7 +92,7 @@ public class CompDocEvents {
             modelService = dispatcher.getDispatchContext().getModelService("persistContentAndAssoc");
         } catch (GenericServiceException e) {
             String errMsg = "Error getting model service for serviceName, 'persistContentAndAssoc'. " + e.toString();
-            Debug.logError(errMsg, module);
+            Debug.logError(errMsg, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg + "</li>");
             return "error";
         }
@@ -103,7 +103,7 @@ public class CompDocEvents {
             if (ServiceUtil.isError(persistResult)) {
                 String errMsg = "Error running serviceName, 'persistContentAndAssoc'. " + ServiceUtil.getErrorMessage(persistResult);
                 request.setAttribute("_ERROR_MESSAGE_",  "<li>" + errMsg + "</li>");
-                Debug.logError(errMsg, module);
+                Debug.logError(errMsg, MODULE);
                 return "error";
             }
             contentId = (String)persistResult.get("contentId");
@@ -122,7 +122,7 @@ public class CompDocEvents {
             if (ServiceUtil.isError(result)) {
                 String errMsg = "Error running serviceName, 'persistContentRevisionAndItem'. " + ServiceUtil.getErrorMessage(result);
                 request.setAttribute("_ERROR_MESSAGE_",  "<li>" + errMsg + "</li>");
-                Debug.logError(errMsg, module);
+                Debug.logError(errMsg, MODULE);
                 return "error";
             }
             for (Entry<String, Object> entry : result.entrySet()) {
@@ -132,7 +132,7 @@ public class CompDocEvents {
             }
         } catch (GenericServiceException e) {
             String errMsg = "Error running serviceName, 'persistContentAndAssoc'. " + e.toString();
-            Debug.logError(errMsg, module);
+            Debug.logError(errMsg, MODULE);
             request.setAttribute("_ERROR_MESSAGE_", "<li>" + errMsg + "</li>");
             return "error";
         }
@@ -172,7 +172,7 @@ public class CompDocEvents {
             if (ServiceUtil.isError(results)) {
                 String errorMessage = ServiceUtil.getErrorMessage(results);
                 request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                Debug.logError(errorMessage, module);
+                Debug.logError(errorMessage, MODULE);
                 return "error";
             }
         } catch (GenericServiceException e) {
@@ -221,7 +221,7 @@ public class CompDocEvents {
             if (ServiceUtil.isError(results)) {
                 String errorMessage = ServiceUtil.getErrorMessage(results);
                 request.setAttribute("_ERROR_MESSAGE_", errorMessage);
-                Debug.logError(errorMessage, module);
+                Debug.logError(errorMessage, MODULE);
                 return "error";
             }
         } catch (GenericServiceException e) {
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java b/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
index 6fbce52..333b545 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/compdoc/CompDocServices.java
@@ -59,7 +59,7 @@ import com.lowagie.text.pdf.PdfReader;
  */
 
 public class CompDocServices {
-    public static final String module = CompDocServices.class.getName();
+    public static final String MODULE = CompDocServices.class.getName();
     public static final String resource = "ContentUiLabels";
     
     /**
@@ -84,7 +84,7 @@ public class CompDocServices {
             try {
                 EntityQuery.use(delegator).from("Content").where("contentId", contentId).queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, "Error running serviceName persistContentAndAssoc", module);
+                Debug.logError(e, "Error running serviceName persistContentAndAssoc", MODULE);
                 return ServiceUtil.returnError(UtilProperties.getMessage(CoreEvents.err_resource, "ContentNoContentFound", UtilMisc.toMap("contentId", contentId), locale));
            }
         }
@@ -93,7 +93,7 @@ public class CompDocServices {
         try {
             modelService = dispatcher.getDispatchContext().getModelService("persistContentAndAssoc");
         } catch (GenericServiceException e) {
-            Debug.logError("Error getting model service for serviceName, 'persistContentAndAssoc'. " + e.toString(), module);
+            Debug.logError("Error getting model service for serviceName, 'persistContentAndAssoc'. " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(CoreEvents.err_resource, "coreEvents.error_modelservice_for_srv_name", locale));
         }
         Map<String, Object> persistMap = modelService.makeValid(context, ModelService.IN_PARAM);
@@ -120,7 +120,7 @@ public class CompDocServices {
             result.putAll(persistRevResult);
             return result;
         } catch (GenericServiceException e) {
-            Debug.logError(e, "Error running serviceName, 'persistContentAndAssoc'. " + e.toString(), module);
+            Debug.logError(e, "Error running serviceName, 'persistContentAndAssoc'. " + e.toString(), MODULE);
             return ServiceUtil.returnError(UtilProperties.getMessage(resource, "ContentContentCreatingError", UtilMisc.toMap("serviceName", "persistContentAndAssoc"), locale) + e.toString());
         }
     }
@@ -175,7 +175,7 @@ public class CompDocServices {
                     ByteBuffer byteBuffer = DataResourceWorker.getContentAsByteBuffer(delegator, thisDataResourceId, https, webSiteId, locale, rootDir);
                     inputByteArray = byteBuffer.array();
                     String s = new String(inputByteArray, "UTF-8");
-                    Debug.logInfo("text/html string:" + s, module);
+                    Debug.logInfo("text/html string:" + s, MODULE);
                     continue;
                 } else if (inputMimeType != null && "application/vnd.ofbiz.survey.response".equals(inputMimeType)) {
                     String surveyResponseId = dataResource.getString("relatedDetailId");
@@ -240,7 +240,7 @@ public class CompDocServices {
         } catch (GenericEntityException e) {
             return ServiceUtil.returnError(e.toString());
         } catch (IOException | DocumentException | GeneralException e) {
-            Debug.logError(e, "Error in CompDoc operation: ", module);
+            Debug.logError(e, "Error in CompDoc operation: ", MODULE);
             return ServiceUtil.returnError(e.toString());
         }
     }
@@ -269,7 +269,7 @@ public class CompDocServices {
             if (UtilValidate.isEmpty(contentRevisionSeqId)) {
                 GenericValue content = EntityQuery.use(delegator).from("Content").where("contentId", contentId).cache().queryOne();
                 dataResourceId = content.getString("dataResourceId");
-                Debug.logInfo("SCVH(0b)- dataResourceId:" + dataResourceId, module);
+                Debug.logInfo("SCVH(0b)- dataResourceId:" + dataResourceId, MODULE);
                 dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne();
              } else {
                 GenericValue contentRevisionItem = EntityQuery.use(delegator).from("ContentRevisionItem").where("contentId", contentId, "itemContentId", contentId, "contentRevisionSeqId", contentRevisionSeqId).cache().queryOne();
@@ -277,11 +277,11 @@ public class CompDocServices {
                     throw new ViewHandlerException("ContentRevisionItem record not found for contentId=" + contentId
                                                    + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId);
                 }
-                Debug.logInfo("SCVH(1)- contentRevisionItem:" + contentRevisionItem, module);
+                Debug.logInfo("SCVH(1)- contentRevisionItem:" + contentRevisionItem, MODULE);
                 Debug.logInfo("SCVH(2)-contentId=" + contentId
-                        + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId, module);
+                        + ", contentRevisionSeqId=" + contentRevisionSeqId + ", itemContentId=" + contentId, MODULE);
                 dataResourceId = contentRevisionItem.getString("newDataResourceId");
-                Debug.logInfo("SCVH(3)- dataResourceId:" + dataResourceId, module);
+                Debug.logInfo("SCVH(3)- dataResourceId:" + dataResourceId, MODULE);
                 dataResource = EntityQuery.use(delegator).from("DataResource").where("dataResourceId", dataResourceId).queryOne();
             }
             String inputMimeType = null;
@@ -296,7 +296,7 @@ public class CompDocServices {
                 ByteBuffer byteBuffer = DataResourceWorker.getContentAsByteBuffer(delegator, dataResourceId, https, webSiteId, locale, rootDir);
                 inputByteArray = byteBuffer.array();
                 String s = new String(inputByteArray, "UTF-8");
-                Debug.logInfo("text/html string:" + s, module);
+                Debug.logInfo("text/html string:" + s, MODULE);
             } else if (inputMimeType != null && "application/vnd.ofbiz.survey.response".equals(inputMimeType)) {
                 String surveyResponseId = dataResource.getString("relatedDetailId");
                 String surveyId = null;
@@ -344,7 +344,7 @@ public class CompDocServices {
             }
 
             if (inputByteArray == null) {
-                Debug.logError("Error in PDF generation: ", module);
+                Debug.logError("Error in PDF generation: ", MODULE);
                 return ServiceUtil.returnError("The array used to create outByteBuffer is still declared null");
             }
             ByteBuffer outByteBuffer = ByteBuffer.wrap(inputByteArray);
@@ -352,7 +352,7 @@ public class CompDocServices {
         } catch (GenericEntityException e) {
             return ServiceUtil.returnError(e.toString());
         } catch (IOException | GeneralException e) {
-            Debug.logError(e, "Error in PDF generation: ", module);
+            Debug.logError(e, "Error in PDF generation: ", MODULE);
             return ServiceUtil.returnError(e.toString());
         }
         return results;
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
index 8425702..8ca51dc 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentEvents.java
@@ -42,7 +42,7 @@ import org.apache.ofbiz.security.Security;
  */
 public class ContentEvents {
 
-    public static final String module = ContentEvents.class.getName();
+    public static final String MODULE = ContentEvents.class.getName();
     public static final String resource = "ContentErrorUiLabels";
 
     /**
@@ -80,7 +80,7 @@ public class ContentEvents {
             beganTx = TransactionUtil.begin(7200);
             if (Debug.infoOn()) {
                 long count = contentQuery.queryCount();
-                Debug.logInfo("========== Found " + count + " contents to index ==========", module);
+                Debug.logInfo("========== Found " + count + " contents to index ==========", MODULE);
             }
             GenericValue content;
             try (EntityListIterator entityListIterator = contentQuery.queryIterator()) {
@@ -88,24 +88,24 @@ public class ContentEvents {
                     ContentKeywordIndex.indexKeywords(content, "Y".equals(doAll));
                     numConts++;
                     if (numConts % 500 == 0) {
-                        Debug.logInfo("Keywords indexed for " + numConts + " so far", module);
+                        Debug.logInfo("Keywords indexed for " + numConts + " so far", MODULE);
                     }
                 }
             } catch (GenericEntityException e) {
                 errMsg = "[ContentEvents.updateAllContentKeywords] Could not create content-keyword (write error); message: " + e.getMessage();
-                Debug.logWarning(errMsg, module);
+                Debug.logWarning(errMsg, MODULE);
                 errConts++;
                 request.setAttribute("_ERROR_MESSAGE_", errMsg);
             }
         } catch (GenericEntityException gee) {
-            Debug.logWarning(gee, gee.getMessage(), module);
+            Debug.logWarning(gee, gee.getMessage(), MODULE);
             Map<String, String> messageMap = UtilMisc.toMap("gee", gee.toString());
             errMsg = UtilProperties.getMessage(resource,"contentevents.error_getting_content_list", messageMap, UtilHttp.getLocale(request));
             request.setAttribute("_ERROR_MESSAGE_", errMsg);
             try {
                 TransactionUtil.rollback(beganTx, gee.getMessage(), gee);
             } catch (GenericTransactionException e1) {
-                Debug.logError(e1, module);
+                Debug.logError(e1, MODULE);
             }
             return "error";
 
@@ -114,7 +114,7 @@ public class ContentEvents {
         try {
             TransactionUtil.commit(beganTx);
         } catch (GenericTransactionException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
         }
 
         if (errConts == 0) {
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
index 5f43b69..280be22 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentKeywordIndex.java
@@ -43,7 +43,7 @@ import org.apache.ofbiz.entity.util.EntityUtilProperties;
  */
 public class ContentKeywordIndex {
 
-    public static final String module = ContentKeywordIndex.class.getName();
+    public static final String MODULE = ContentKeywordIndex.class.getName();
 
     public static void forceIndexKeywords(GenericValue content) throws GenericEntityException {
         ContentKeywordIndex.indexKeywords(content, true);
@@ -195,7 +195,7 @@ public class ContentKeywordIndex {
             }
         }
         if (toBeStored.size() > 0) {
-            if (Debug.verboseOn()) Debug.logVerbose("[ContentKeywordIndex.indexKeywords] Storing " + toBeStored.size() + " keywords for contentId " + content.getString("contentId"), module);
+            if (Debug.verboseOn()) Debug.logVerbose("[ContentKeywordIndex.indexKeywords] Storing " + toBeStored.size() + " keywords for contentId " + content.getString("contentId"), MODULE);
 
             if ("true".equals(EntityUtilProperties.getPropertyValue("contentsearch", "index.delete.on_index", "false", delegator))) {
                 // delete all keywords if the properties file says to
@@ -214,9 +214,9 @@ public class ContentKeywordIndex {
                 strings.add(contentText);
             }
         } catch (IOException e1) {
-            Debug.logError(e1, "Error getting content text to index", module);
+            Debug.logError(e1, "Error getting content text to index", MODULE);
         } catch (GeneralException e1) {
-            Debug.logError(e1, "Error getting content text to index", module);
+            Debug.logError(e1, "Error getting content text to index", MODULE);
         }
     }
 
diff --git a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
index ef9360f..ba51e1b 100644
--- a/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
+++ b/applications/content/src/main/java/org/apache/ofbiz/content/content/ContentMapFacade.java
@@ -49,7 +49,7 @@ import org.apache.ofbiz.webapp.website.WebSiteWorker;
  */
 public class ContentMapFacade implements Map<Object, Object> {
 
-    public static final String module = ContentMapFacade.class.getName();
+    public static final String MODULE = ContentMapFacade.class.getName();
 
     private static final Set<String> mapKeySet = new HashSet<>();
     static {
@@ -114,7 +114,7 @@ public class ContentMapFacade implements Map<Object, Object> {
                 this.value = EntityQuery.use(this.delegator).from("Content").where("contentId", contentId).queryOne();
             }
         } catch (GenericEntityException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             throw new RuntimeException(e.getMessage());
         }
         init();
@@ -158,24 +158,24 @@ public class ContentMapFacade implements Map<Object, Object> {
 
     @Override
     public Object put(Object name, Object value) {
-        Debug.logWarning("This [put()] method is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This [put()] method is not implemented in ContentMapFacade", MODULE);
         return null;
     }
 
     @Override
     public Object remove(Object object) {
-        Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade", MODULE);
         return null;
     }
 
     @Override
     public void putAll(Map<?, ?> map) {
-        Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade", MODULE);
     }
 
     @Override
     public void clear() {
-        Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade", MODULE);
     }
 
     @Override
@@ -185,19 +185,19 @@ public class ContentMapFacade implements Map<Object, Object> {
 
     @Override
     public Collection<Object> values() {
-        Debug.logWarning("This method [values()] is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This method [values()] is not implemented in ContentMapFacade", MODULE);
         return null;
     }
 
     @Override
     public Set<Map.Entry<Object, Object>> entrySet() {
-        Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade", module);
+        Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade", MODULE);
         return null;
     }
 
     public void setSortOrder(Object obj) {
         if (!(obj instanceof String)) {
-            Debug.logWarning("sortOrder parameters must be a string", module);
+            Debug.logWarning("sortOrder parameters must be a string", MODULE);
             return;
         }
         this.sortOrder=(String) obj;
@@ -206,7 +206,7 @@ public class ContentMapFacade implements Map<Object, Object> {
 
     public void setMapKeyFilter(Object obj) {
         if (!(obj instanceof String)) {
-            Debug.logWarning("mapKeyFilter parameters must be a string", module);
+            Debug.logWarning("mapKeyFilter parameters must be a string", MODULE);
             return;
         }
         this.mapKeyFilter=(String) obj;
@@ -214,7 +214,7 @@ public class ContentMapFacade implements Map<Object, Object> {
 
     public void setStatusFilter(Object obj) {
         if (!(obj instanceof String)) {
-            Debug.logWarning("statusFilter parameters must be a string", module);
+            Debug.logWarning("statusFilter parameters must be a string", MODULE);
             return;
         }
         this.statusFilter=(String) obj;
@@ -229,7 +229,7 @@ public class ContentMapFacade implements Map<Object, Object> {
     @Override
     public Object get(Object obj) {
         if (!(obj instanceof String)) {
-            Debug.logWarning("Key parameters must be a string", module);
+            Debug.logWarning("Key parameters must be a string", MODULE);
             return null;
         }
         String name = (String) obj;
@@ -246,7 +246,7 @@ public class ContentMapFacade implements Map<Object, Object> {
                 }
                 this.fields = contentQuery.queryOne();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             return this.fields;
 
@@ -276,7 +276,7 @@ public class ContentMapFacade implements Map<Object, Object> {
                             contentUri = webSitePathAlias.getString("pathAlias");
                         }
                     } catch (GenericEntityException e) {
-                        Debug.logError(e, module);
+                        Debug.logError(e, MODULE);
                     }
                 }
                 String contextLink = rh.makeLink(request, response, contentUri, true, false, true);
@@ -307,7 +307,7 @@ public class ContentMapFacade implements Map<Object, Object> {
                         .filterByDate()
                         .cache(cache).queryList();
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (subs != null) {
                 for (GenericValue v: subs) {
@@ -335,7 +335,7 @@ public class ContentMapFacade implements Map<Object, Object> {
     protected String renderThis() {
         if (!this.allowRender && !this.isDecorated) {
             String errorMsg = "WARNING: Cannot render content being rendered! (Infinite Recursion NOT allowed!)";
-            Debug.logWarning(errorMsg, module);
+            Debug.logWarning(errorMsg, MODULE);
             return "=========> " + errorMsg + " <=========";
         }
         // TODO: change to use the MapStack instead of a cloned Map
@@ -352,10 +352,10 @@ public class ContentMapFacade implements Map<Object, Object> {
         try {
             return ContentWorker.renderContentAsText(dispatcher, contentId, renderCtx, locale, mimeType, cache);
         } catch (GeneralException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return e.toString();
         } catch (IOException e) {
-            Debug.logError(e, module);
+            Debug.logError(e, MODULE);
             return e.toString();
         }
     }
@@ -388,41 +388,41 @@ public class ContentMapFacade implements Map<Object, Object> {
 
         @Override
         public Object put(Object name, Object value) {
-            Debug.logWarning("This [put()] method is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This [put()] method is not implemented in ContentMapFacade.AbstractInfo", MODULE);
             return null;
         }
 
         @Override
         public Object remove(Object object) {
-            Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This [remove()] method is not implemented in ContentMapFacade.AbstractInfo", MODULE);
             return null;
         }
 
         @Override
         public void putAll(Map<?, ?> map) {
-            Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This method [putAll()] is not implemented in ContentMapFacade.AbstractInfo", MODULE);
         }
 
         @Override
         public void clear() {
-            Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This method [clear()] is not implemented in ContentMapFacade.AbstractInfo", MODULE);
         }
 
         @Override
         public Set<Object> keySet() {
-            Debug.logWarning("This method [keySet()] is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This method [keySet()] is not implemented in ContentMapFacade.AbstractInfo", MODULE);
             return null;
         }
 
         @Override
         public Collection<Object> values() {
-            Debug.logWarning("This method [values()] is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This method [values()] is not implemented in ContentMapFacade.AbstractInfo", MODULE);
             return null;
         }
 
         @Override
         public Set<Map.Entry<Object, Object>> entrySet() {
-            Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade.AbstractInfo", module);
+            Debug.logWarning("This method [entrySet()] is not implemented in ContentMapFacade.AbstractInfo", MODULE);
             return null;
         }
     }
@@ -431,7 +431,7 @@ public class ContentMapFacade implements Map<Object, Object> {
         @Override
         public Object get(Object key) {
             if (!(key instanceof String)) {
-                Debug.logWarning("Key parameters must be a string", module);
+                Debug.logWarning("Key parameters must be a string", MODULE);
                 return null;
             }
             String name = (String) key;
@@ -448,7 +448,7 @@ public class ContentMapFacade implements Map<Object, Object> {
                     content = EntityQuery.use(delegator).from("Content").where("contentId", name).queryOne();
                 }
             } catch (GenericEntityException e) {
-                Debug.logError(e, module);
+                Debug.logError(e, MODULE);
             }
             if (content != null) {
                 return new ContentMapFacade(dispatcher, content.getString("contentId"), context, locale, mimeType, cache);
@@ -464,7 +464,7 @@ public class ContentMapFacade implements Map<Object, Object> {
         @Override
         public Object get(Object key) {
             if (!(key instanceof String)) {
-                Debug.logWarning("Key parameters must be a string", module);
+                Debug.logWarning("Key parameters must be a string", MODULE);
                 return null;
             }
... 50069 lines suppressed ...


Mime
View raw message