killbill-memoizeit

diff --git a/api/src/main/java/org/killbill/billing/util/template/translation/TranslatorConfig.java b/api/src/main/java/org/killbill/billing/util/template/translation/TranslatorConfig.java
index afedff8..f6246d6 100644
--- a/api/src/main/java/org/killbill/billing/util/template/translation/TranslatorConfig.java
+++ b/api/src/main/java/org/killbill/billing/util/template/translation/TranslatorConfig.java
@@ -26,35 +26,35 @@ public interface TranslatorConfig {
 
     // Common
 
-    @Config("killbill.default.locale")
+    @Config("org.killbill.default.locale")
     @Default("en_US")
     @Description("Default Killbill locale")
     public String getDefaultLocale();
 
     // Catalog
 
-    @Config("killbill.catalog.bundlePath")
+    @Config("org.killbill.catalog.bundlePath")
     @Default("org/killbill/billing/util/template/translation/CatalogTranslation")
     @Description("Path to the catalog translation bundle")
     String getCatalogBundlePath();
 
     // Invoices
-    @Config("killbill.template.bundlePath")
+    @Config("org.killbill.template.bundlePath")
     @Default("org/killbill/billing/util/template/translation/InvoiceTranslation")
     @Description("Path to the invoice template translation bundle")
     public String getInvoiceTemplateBundlePath();
 
-    @Config("killbill.template.name")
+    @Config("org.killbill.template.name")
     @Default("org/killbill/billing/util/email/templates/HtmlInvoiceTemplate.mustache")
     @Description("Path to the HTML invoice template")
     String getTemplateName();
 
-    @Config("killbill.manualPayTemplate.name")
+    @Config("org.killbill.manualPayTemplate.name")
     @Default("org/killbill/billing/util/email/templates/HtmlInvoiceTemplate.mustache")
     @Description("Path to the invoice template for accounts with MANUAL_PAY tag")
     String getManualPayTemplateName();
 
-    @Config("killbill.template.invoiceFormatterFactoryClass")
+    @Config("org.killbill.template.invoiceFormatterFactoryClass")
     @Default("org.killbill.billing.invoice.template.formatters.DefaultInvoiceFormatterFactory")
     @Description("Invoice formatter class")
     Class<? extends InvoiceFormatterFactory> getInvoiceFormatterFactoryClass();

diff --git a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
index 79bae69..c4469f1 100644
--- a/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
+++ b/beatrix/src/test/java/org/killbill/billing/beatrix/integration/overdue/TestOverdueIntegration.java
@@ -48,7 +48,7 @@ import org.killbill.billing.payment.api.Payment;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
-// For all the tests, we set the the property killbill.payment.retry.days=8,8,8,8,8,8,8,8 so that Payment retry logic does not end with an ABORTED state
+// For all the tests, we set the the property org.killbill.payment.retry.days=8,8,8,8,8,8,8,8 so that Payment retry logic does not end with an ABORTED state
 // preventing final instant payment to succeed.
 //
 // The tests are difficult to follow because there are actually two tracks of retry in logic:

diff --git a/beatrix/src/test/resources/beatrix.properties b/beatrix/src/test/resources/beatrix.properties
index ad6d9fb..e336e19 100644
--- a/beatrix/src/test/resources/beatrix.properties
+++ b/beatrix/src/test/resources/beatrix.properties
@@ -1,28 +1,28 @@
-killbill.catalog.uri=file:src/test/resources/catalogSample.xml
+org.killbill.catalog.uri=file:src/test/resources/catalogSample.xml
 
-killbill.billing.notificationq.main.sleep=100
-killbill.billing.notificationq.main.nbThreads=1
-killbill.billing.notificationq.main.useInFlightQ=false
-killbill.billing.notificationq.main.prefetch=1
-killbill.billing.notificationq.main.claimed=1
+org.killbill.notificationq.main.sleep=100
+org.killbill.notificationq.main.nbThreads=1
+org.killbill.notificationq.main.useInFlightQ=false
+org.killbill.notificationq.main.prefetch=1
+org.killbill.notificationq.main.claimed=1
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.prefetch=1
-killbill.billing.persistent.bus.main.claimed=1
-killbill.billing.persistent.bus.main.useInFlightQ=false
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.prefetch=1
+org.killbill.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.useInFlightQ=false
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.prefetch=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.useInFlightQ=false
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.prefetch=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.useInFlightQ=false
 
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 
 user.timezone=UTC
-killbill.payment.retry.days=8,8,8,8,8,8,8,8
-killbill.osgi.bundle.install.dir=/var/tmp/beatrix-bundles
+org.killbill.payment.retry.days=8,8,8,8,8,8,8,8
+org.killbill.osgi.bundle.install.dir=/var/tmp/beatrix-bundles
 org.slf4j.simpleLogger.showDateTime=true
 

diff --git a/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt b/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
index 6d5867f..7c0ddf6 100644
--- a/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
+++ b/beatrix/src/test/resources/Catalog-Entitlement-Testplan.txt
@@ -109,4 +109,4 @@ ADD-ON TESTS
     * Add-on creation alignment
     * Add-on cancel with base plan
     
-    
\ No newline at end of file
+    

diff --git a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz
index 8c3a706..c816039 100644
Binary files a/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz and b/beatrix/src/test/resources/killbill-currency-plugin-test.tar.gz differ

diff --git a/beatrix/src/test/resources/killbill-notification-test.tar.gz b/beatrix/src/test/resources/killbill-notification-test.tar.gz
index aa31661..960465e 100644
Binary files a/beatrix/src/test/resources/killbill-notification-test.tar.gz and b/beatrix/src/test/resources/killbill-notification-test.tar.gz differ

diff --git a/beatrix/src/test/resources/killbill-payment-test.tar.gz b/beatrix/src/test/resources/killbill-payment-test.tar.gz
index 6787718..13e0e1f 100644
Binary files a/beatrix/src/test/resources/killbill-payment-test.tar.gz and b/beatrix/src/test/resources/killbill-payment-test.tar.gz differ

diff --git a/entitlement/src/test/resources/entitlement.properties b/entitlement/src/test/resources/entitlement.properties
index 87d47cb..11f0313 100644
--- a/entitlement/src/test/resources/entitlement.properties
+++ b/entitlement/src/test/resources/entitlement.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalog.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java b/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
index 8b0aee7..7256586 100644
--- a/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
+++ b/invoice/src/test/java/org/killbill/billing/invoice/template/formatters/TestDefaultInvoiceFormatter.java
@@ -333,7 +333,7 @@ public class TestDefaultInvoiceFormatter extends InvoiceTestSuiteNoDB {
 
             @Override
             public String getInvoiceTemplateBundlePath() {
-                return "org.killbill/billing/util/template/translation/InvoiceTranslation";
+                return "org/killbill/billing/util/template/translation/InvoiceTranslation";
             }
 
             @Override

diff --git a/junction/src/test/resources/junction.properties b/junction/src/test/resources/junction.properties
index 87d47cb..11f0313 100644
--- a/junction/src/test/resources/junction.properties
+++ b/junction/src/test/resources/junction.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalog.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalog.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/overdue/src/test/resources/resource.properties b/overdue/src/test/resources/resource.properties
index a7e225e..23ed0f6 100644
--- a/overdue/src/test/resources/resource.properties
+++ b/overdue/src/test/resources/resource.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/catalogSample.xml
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/catalogSample.xml
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC
 
 

diff --git a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
index 25e1843..ebf6540 100644
--- a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteNoDB.java
@@ -72,7 +72,7 @@ public abstract class PaymentTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
         Assert.assertNotNull(url);
 
         configSource.merge(url);
-        configSource.setProperty("killbill.payment.provider.default", MockPaymentProviderPlugin.PLUGIN_NAME);
+        configSource.setProperty("org.killbill.payment.provider.default", MockPaymentProviderPlugin.PLUGIN_NAME);
         configSource.setProperty("killbill.payment.engine.events.off", "false");
     }
 

diff --git a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
index c078a1c..3c2330f 100644
--- a/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
+++ b/payment/src/test/java/org/killbill/billing/payment/PaymentTestSuiteWithEmbeddedDB.java
@@ -75,7 +75,7 @@ public abstract class PaymentTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
         Assert.assertNotNull(url);
 
         configSource.merge(url);
-        configSource.setProperty("killbill.payment.provider.default", MockPaymentProviderPlugin.PLUGIN_NAME);
+        configSource.setProperty("org.killbill.payment.provider.default", MockPaymentProviderPlugin.PLUGIN_NAME);
         configSource.setProperty("killbill.payment.engine.events.off", "false");
     }
 

diff --git a/payment/src/test/resources/payment.properties b/payment/src/test/resources/payment.properties
index 5841e2e..41775d7 100644
--- a/payment/src/test/resources/payment.properties
+++ b/payment/src/test/resources/payment.properties
@@ -1,4 +1,4 @@
 killbill.payment.failure.retry.start.sec=3600
 killbill.payment.failure.retry.multiplier=1
 killbill.payment.failure.retry.max.attempts=3
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.claimed=1

diff --git a/server/src/deb/support/killbill.properties b/server/src/deb/support/killbill.properties
index 666b7b2..ed16d9b 100644
--- a/server/src/deb/support/killbill.properties
+++ b/server/src/deb/support/killbill.properties
@@ -22,7 +22,7 @@ org.killbill.jetty.jdbi.user=root
 org.killbill.jetty.jdbi.password=root
 
 # Use the SpyCarAdvanced.xml catalog
-killbill.catalog.uri=SpyCarAdvanced.xml
+org.killbill.catalog.uri=SpyCarAdvanced.xml
 
 # Set default timezone to UTC
 user.timezone=UTC
@@ -30,14 +30,14 @@ user.timezone=UTC
 # For bundles that use antlr (string template)
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 
-killbill.billing.notificationq.main.sleep=100
+org.killbill.notificationq.main.sleep=100
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history

diff --git a/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java b/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
index 4035f3a..883984d 100644
--- a/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
+++ b/server/src/main/java/org/killbill/billing/server/config/KillbillServerConfig.java
@@ -24,12 +24,12 @@ import org.killbill.billing.util.config.KillbillConfig;
 
 public interface KillbillServerConfig extends KillbillConfig {
 
-    @Config("killbill.server.multitenant")
+    @Config("org.killbill.server.multitenant")
     @Default("true")
     @Description("Whether multi-tenancy is enabled")
     public boolean isMultiTenancyEnabled();
 
-    @Config("killbill.server.test.mode")
+    @Config("org.killbill.server.test.mode")
     @Default("false")
     @Description("Whether to start in test mode")
     public boolean isTestModeEnabled();

diff --git a/server/src/main/java/org/killbill/billing/server/config/UpdateCheckConfig.java b/server/src/main/java/org/killbill/billing/server/config/UpdateCheckConfig.java
index b3d5186..1778ba7 100644
--- a/server/src/main/java/org/killbill/billing/server/config/UpdateCheckConfig.java
+++ b/server/src/main/java/org/killbill/billing/server/config/UpdateCheckConfig.java
@@ -26,17 +26,17 @@ import org.killbill.billing.util.config.KillbillConfig;
 
 public interface UpdateCheckConfig extends KillbillConfig {
 
-    @Config("killbill.server.updateCheck.skip")
+    @Config("org.killbill.server.updateCheck.skip")
     @Default("false")
     @Description("Whether to skip update checks")
     public boolean shouldSkipUpdateCheck();
 
-    @Config("killbill.server.updateCheck.url")
+    @Config("org.killbill.server.updateCheck.url")
     @Default("https://raw.github.com/killbill/killbill/master/server/src/main/resources/update-checker/killbill-server-update-list.properties")
     @Description("URL to retrieve the latest version of Kill Bill")
     public URI updateCheckURL();
 
-    @Config("killbill.server.updateCheck.connectTimeout")
+    @Config("org.killbill.server.updateCheck.connectTimeout")
     @Default("3000")
     @Description("Update check connection timeout")
     public int updateCheckConnectionTimeout();

diff --git a/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java b/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
index 9eff8df..ce16651 100644
--- a/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
+++ b/server/src/main/java/org/killbill/billing/server/updatechecker/ProductInfo.java
@@ -38,7 +38,7 @@ public class ProductInfo {
 
     private static final Logger log = LoggerFactory.getLogger(ProductInfo.class);
 
-    private static final String KILLBILL_SERVER_VERSION_RESOURCE = "/org.killbill/billing/server/version.properties";
+    private static final String KILLBILL_SERVER_VERSION_RESOURCE = "/org/killbill/billing/server/version.properties";
 
     private static final String UNKNOWN = "UNKNOWN";
 

diff --git a/server/src/main/resources/killbill-server.properties b/server/src/main/resources/killbill-server.properties
index 0a9ec96..0295406 100644
--- a/server/src/main/resources/killbill-server.properties
+++ b/server/src/main/resources/killbill-server.properties
@@ -16,12 +16,12 @@
 
 
 # Use skeleton properties for server and configure killbill database
-org.killbill.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
-org.killbill.jetty.jdbi.user=root
-org.killbill.jetty.jdbi.password=root
+com.ning.jetty.jdbi.url=jdbc:mysql://127.0.0.1:3306/killbill
+com.ning.jetty.jdbi.user=root
+com.ning.jetty.jdbi.password=root
 
 # Use the SpyCarAdvanced.xml catalog
-killbill.catalog.uri=SpyCarAdvanced.xml
+org.killbill.catalog.uri=SpyCarAdvanced.xml
 
 # Set default timezone to UTC
 user.timezone=UTC
@@ -30,20 +30,20 @@ user.timezone=UTC
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 
 # To enable test endpoint and have Kill Bill run with a ClockMock
-killbill.server.test.mode=true
+org.killbill.server.test.mode=true
 
 
-killbill.billing.notificationq.main.sleep=100
+org.killbill.notificationq.main.sleep=100
 
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 
-killbill.server.multitenant=false
+org.killbill.server.multitenant=false
 

diff --git a/server/src/main/resources/shiro.ini b/server/src/main/resources/shiro.ini
index 48e9fa6..78798a9 100644
--- a/server/src/main/resources/shiro.ini
+++ b/server/src/main/resources/shiro.ini
@@ -21,7 +21,7 @@
 # Use -Dkillbill.server.rbac=false to disable RBAC
 
 # Default admin user
-# Use -Dkillbill.security.shiroResourcePath=/var/tmp/shiro.ini to specify your own config
+# Use -Dorg.killbill.security.shiroResourcePath=/var/tmp/shiro.ini to specify your own config
 [users]
 admin = password, root
 

diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 11d2ce7..80448bb 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -46,7 +46,7 @@
     </filter-mapping>
     <listener>
         <!-- Jersey insists on using java.util.logging (JUL) -->
-        <listener-class>org.killbill.jetty.core.listeners.SetupJULBridge</listener-class>
+        <listener-class>com.ning.jetty.core.listeners.SetupJULBridge</listener-class>
     </listener>
     <listener>
         <!-- Context listener: called at startup time and creates the injector -->

diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 4c14642..ca00d26 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -17,33 +17,31 @@
 # Use killbill util test properties (DbiProvider/MysqltestingHelper) on the test side configured with killbill
 org.killbill.billing.dbi.jdbc.url=jdbc:mysql://127.0.0.1:3306/killbill
 
-killbill.catalog.uri=catalog-weapons.xml
+org.killbill.catalog.uri=catalog-weapons.xml
 killbill.overdue.uri=overdue.xml
 
-killbill.payment.engine.events.off=false
-killbill.payment.retry.days=8,8,8
+org.killbill.payment.engine.events.off=false
+org.killbill.payment.retry.days=8,8,8
 
 user.timezone=UTC
 
 org.killbill.core.server.jetty.logPath=/var/tmp/.logs
 
-killbill.payment.engine.notifications.sleep=100
-killbill.invoice.engine.notifications.sleep=100
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
-killbill.billing.persistent.bus.external.sleep=100
-killbill.billing.persistent.bus.external.nbThreads=1
-killbill.billing.persistent.bus.external.claimed=1
-killbill.billing.persistent.bus.external.tableName=bus_ext_events
-killbill.billing.persistent.bus.external.historyTableName=bus_ext_events_history
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
+org.killbill.persistent.bus.external.sleep=100
+org.killbill.persistent.bus.external.nbThreads=1
+org.killbill.persistent.bus.external.claimed=1
+org.killbill.persistent.bus.external.tableName=bus_ext_events
+org.killbill.persistent.bus.external.historyTableName=bus_ext_events_history
 # Local DB
 #org.killbill.billing.dbi.test.useLocalDb=true
 
-killbill.osgi.bundle.install.dir=/var/tmp/somethingthatdoesnotexist
+org.killbill.osgi.bundle.install.dir=/var/tmp/somethingthatdoesnotexist
 
 # Speed up from the (more secure) default
-killbill.server.multitenant.hash_iterations=10
+org.killbill.server.multitenant.hash_iterations=10
 
 ANTLR_USE_DIRECT_CLASS_LOADING=true
 

diff --git a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
index fbc2e91..927afd9 100644
--- a/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
+++ b/subscription/src/test/java/org/killbill/billing/subscription/alignment/TestPlanAligner.java
@@ -63,7 +63,7 @@ public class TestPlanAligner extends SubscriptionTestSuiteNoDB {
         super.beforeClass();
         final VersionedCatalogLoader versionedCatalogLoader = new VersionedCatalogLoader(clock);
         final CatalogConfig config = new ConfigurationObjectFactory(new ConfigSource() {
-            final Map<String, String> properties = ImmutableMap.<String, String>of("killbill.catalog.uri", "file:src/test/resources/testInput.xml");
+            final Map<String, String> properties = ImmutableMap.<String, String>of("org.killbill.catalog.uri", "file:src/test/resources/testInput.xml");
 
             @Override
             public String getString(final String propertyName) {

diff --git a/subscription/src/test/resources/subscription.properties b/subscription/src/test/resources/subscription.properties
index b1d5ad6..9695ca4 100644
--- a/subscription/src/test/resources/subscription.properties
+++ b/subscription/src/test/resources/subscription.properties
@@ -1,5 +1,5 @@
-killbill.catalog.uri=file:src/test/resources/testInput.xml
-killbill.billing.persistent.bus.main.sleep=100
-killbill.billing.persistent.bus.main.nbThreads=1
-killbill.billing.persistent.bus.main.claimed=1
+org.killbill.catalog.uri=file:src/test/resources/testInput.xml
+org.killbill.persistent.bus.main.sleep=100
+org.killbill.persistent.bus.main.nbThreads=1
+org.killbill.persistent.bus.main.claimed=1
 user.timezone=UTC

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java b/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
index ed134d5..f1ce2a2 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/security/KillbillCredentialsMatcher.java
@@ -22,7 +22,7 @@ import org.apache.shiro.crypto.hash.Sha512Hash;
 
 public class KillbillCredentialsMatcher {
 
-    public static final String KILLBILL_TENANT_HASH_ITERATIONS_PROPERTY = "killbill.server.multitenant.hash_iterations";
+    public static final String KILLBILL_TENANT_HASH_ITERATIONS_PROPERTY = "org.killbill.server.multitenant.hash_iterations";
 
     // See http://www.stormpath.com/blog/strong-password-hashing-apache-shiro and https://issues.apache.org/jira/browse/SHIRO-290
     public static final String HASH_ALGORITHM_NAME = Sha512Hash.ALGORITHM_NAME;

diff --git a/util/src/main/java/org/killbill/billing/util/config/CacheConfig.java b/util/src/main/java/org/killbill/billing/util/config/CacheConfig.java
index dd77e81..b3ee5a9 100644
--- a/util/src/main/java/org/killbill/billing/util/config/CacheConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/CacheConfig.java
@@ -22,7 +22,7 @@ import org.skife.config.Description;
 
 public interface CacheConfig extends KillbillConfig {
 
-    @Config("killbill.cache.config.location")
+    @Config("org.killbill.cache.config.location")
     @Default("/ehcache.xml")
     @Description("Path to Ehcache XML configuration")
     public String getCacheConfigLocation();

diff --git a/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java b/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
index e00ea01..28c09ef 100644
--- a/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/CatalogConfig.java
@@ -22,7 +22,7 @@ import org.skife.config.Description;
 
 public interface CatalogConfig extends KillbillConfig {
 
-    @Config("killbill.catalog.uri")
+    @Config("org.killbill.catalog.uri")
     @Default("SpyCarBasic.xml")
     @Description("Catalog location. Either in the classpath or in the filesystem")
     String getCatalogURI();

diff --git a/util/src/main/java/org/killbill/billing/util/config/CurrencyConfig.java b/util/src/main/java/org/killbill/billing/util/config/CurrencyConfig.java
index 7bb7707..9646dc9 100644
--- a/util/src/main/java/org/killbill/billing/util/config/CurrencyConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/CurrencyConfig.java
@@ -22,7 +22,7 @@ import org.skife.config.Description;
 
 public interface CurrencyConfig extends KillbillConfig {
 
-    @Config("killbill.currency.provider.default")
+    @Config("org.killbill.currency.provider.default")
     @Default("killbill-currency-plugin")
     @Description("Default currency provider to use")
     public String getDefaultCurrencyProvider();

diff --git a/util/src/main/java/org/killbill/billing/util/config/InvoiceConfig.java b/util/src/main/java/org/killbill/billing/util/config/InvoiceConfig.java
index 79d97ec..cd71a12 100644
--- a/util/src/main/java/org/killbill/billing/util/config/InvoiceConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/InvoiceConfig.java
@@ -22,12 +22,12 @@ import org.skife.config.Description;
 
 public interface InvoiceConfig extends KillbillConfig {
 
-    @Config("killbill.invoice.maxNumberOfMonthsInFuture")
+    @Config("org.killbill.invoice.maxNumberOfMonthsInFuture")
     @Default("36")
     @Description("Maximum target date to consider when generating an invoice")
     public int getNumberOfMonthsInFuture();
 
-    @Config("killbill.invoice.emailNotificationsEnabled")
+    @Config("org.killbill.invoice.emailNotificationsEnabled")
     @Default("false")
     @Description("Whether to send email notifications on invoice creation (for configured accounts)")
     public boolean isEmailNotificationsEnabled();

diff --git a/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java b/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
index 4a2a2b5..0107e83 100644
--- a/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/OSGIConfig.java
@@ -22,27 +22,27 @@ import org.skife.config.Description;
 
 public interface OSGIConfig extends KillbillConfig {
 
-    @Config("killbill.osgi.bundle.property.name")
+    @Config("org.killbill.osgi.bundle.property.name")
     @Default("killbill.properties")
     @Description("Name of the properties file for OSGI plugins")
     public String getOSGIKillbillPropertyName();
 
-    @Config("killbill.osgi.root.dir")
+    @Config("org.killbill.osgi.root.dir")
     @Default("/var/tmp/felix")
     @Description("Bundles cache area for the OSGI framework")
     public String getOSGIBundleRootDir();
 
-    @Config("killbill.osgi.bundle.cache.name")
+    @Config("org.killbill.osgi.bundle.cache.name")
     @Default("osgi-cache")
     @Description("Bundles cache name")
     public String getOSGIBundleCacheName();
 
-    @Config("killbill.osgi.bundle.install.dir")
+    @Config("org.killbill.osgi.bundle.install.dir")
     @Default("/var/tmp/bundles")
     @Description("Bundles install directory")
     public String getRootInstallationDir();
 
-    @Config("killbill.osgi.system.bundle.export.packages")
+    @Config("org.killbill.osgi.system.bundle.export.packages")
     @Default("org.killbill.billing.account.api," +
              "org.killbill.billing.analytics.api.sanity," +
              "org.killbill.billing.analytics.api.user," +

diff --git a/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java b/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
index c63aeac..da7f219 100644
--- a/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/PaymentConfig.java
@@ -25,41 +25,41 @@ import org.skife.config.TimeSpan;
 
 public interface PaymentConfig extends KillbillConfig {
 
-    @Config("killbill.payment.provider.default")
+    @Config("org.killbill.payment.provider.default")
     // See ExternalPaymentProviderPlugin.PLUGIN_NAME
     @Default("__external_payment__")
     @Description("Default payment provider to use")
     public String getDefaultPaymentProvider();
 
-    @Config("killbill.payment.retry.days")
+    @Config("org.killbill.payment.retry.days")
     @Default("8,8,8")
     @Description("Interval in days between payment retries")
     public List<Integer> getPaymentRetryDays();
 
-    @Config("killbill.payment.failure.retry.start.sec")
+    @Config("orgkillbill.payment.failure.retry.start.sec")
     @Default("300")
     public int getPluginFailureRetryStart();
 
-    @Config("killbill.payment.failure.retry.multiplier")
+    @Config("org.killbill.payment.failure.retry.multiplier")
     @Default("2")
     public int getPluginFailureRetryMultiplier();
 
-    @Config("killbill.payment.failure.retry.max.attempts")
+    @Config("org.killbill.payment.failure.retry.max.attempts")
     @Default("8")
     @Description("Maximum number of retries for failed payments")
     public int getPluginFailureRetryMaxAttempts();
 
-    @Config("killbill.payment.plugin.timeout")
+    @Config("org.killbill.payment.plugin.timeout")
     @Default("90s")
     @Description("Timeout for each payment attempt")
     public TimeSpan getPaymentPluginTimeout();
 
-    @Config("killbill.payment.plugin.threads.nb")
+    @Config("org.killbill.payment.plugin.threads.nb")
     @Default("10")
     @Description("Number of threads for plugin executor dispatcher")
     public int getPaymentPluginThreadNb();
 
-    @Config("killbill.payment.off")
+    @Config("org.killbill.payment.off")
     @Default("false")
     @Description("Whether the payment subsystem is off")
     public boolean isPaymentOff();

diff --git a/util/src/main/java/org/killbill/billing/util/config/RbacConfig.java b/util/src/main/java/org/killbill/billing/util/config/RbacConfig.java
index 3bad21f..900aeff 100644
--- a/util/src/main/java/org/killbill/billing/util/config/RbacConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/RbacConfig.java
@@ -23,7 +23,7 @@ import org.skife.config.TimeSpan;
 
 public interface RbacConfig extends KillbillConfig {
 
-    @Config("killbill.rbac.globalSessionTimeout")
+    @Config("org.killbill.rbac.globalSessionTimeout")
     @Default("1h")
     @Description("System-wide default time that any session may remain idle before expiring")
     public TimeSpan getGlobalSessionTimeout();

diff --git a/util/src/main/java/org/killbill/billing/util/config/SecurityConfig.java b/util/src/main/java/org/killbill/billing/util/config/SecurityConfig.java
index 86b4657..d53b6c6 100644
--- a/util/src/main/java/org/killbill/billing/util/config/SecurityConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/config/SecurityConfig.java
@@ -23,61 +23,61 @@ import org.skife.config.Description;
 
 public interface SecurityConfig extends KillbillConfig {
 
-    @Config("killbill.security.shiroResourcePath")
+    @Config("org.killbill.security.shiroResourcePath")
     @Default("classpath:shiro.ini")
     @Description("Path to the shiro.ini file (classpath, url or file resource)")
     public String getShiroResourcePath();
 
     // LDAP Realm
 
-    @Config("killbill.security.ldap.userDnTemplate")
+    @Config("org.killbill.security.ldap.userDnTemplate")
     @DefaultNull
     @Description("LDAP server's User DN format (e.g. uid={0},ou=users,dc=mycompany,dc=com)")
     public String getShiroLDAPUserDnTemplate();
 
-    @Config("killbill.security.ldap.searchBase")
+    @Config("org.killbill.security.ldap.searchBase")
     @DefaultNull
     @Description("LDAP search base to use")
     public String getShiroLDAPSearchBase();
 
-    @Config("killbill.security.ldap.groupSearchFilter")
+    @Config("org.killbill.security.ldap.groupSearchFilter")
     @Default("memberOf=uid={0}")
     @Description("LDAP search filter to use to find groups (e.g. memberOf=uid={0},ou=users,dc=mycompany,dc=com)")
     public String getShiroLDAPGroupSearchFilter();
 
-    @Config("killbill.security.ldap.groupNameId")
+    @Config("org.killbill.security.ldap.groupNameId")
     @Default("memberOf")
     @Description("Group name attribute ID in LDAP")
     public String getShiroLDAPGroupNameID();
 
-    @Config("killbill.security.ldap.permissionsByGroup")
+    @Config("org.killbill.security.ldap.permissionsByGroup")
     @Default("admin = *:*\n" +
              "finance = invoice:*, payment:*\n" +
              "support = entitlement:*, invoice:item_adjust")
     @Description("LDAP permissions by LDAP group")
     public String getShiroLDAPPermissionsByGroup();
 
-    @Config("killbill.security.ldap.url")
+    @Config("org.killbill.security.ldap.url")
     @Default("ldap://127.0.0.1:389")
     @Description("LDAP server url")
     public String getShiroLDAPUrl();
 
-    @Config("killbill.security.ldap.systemUsername")
+    @Config("org.killbill.security.ldap.systemUsername")
     @DefaultNull
     @Description("LDAP username")
     public String getShiroLDAPSystemUsername();
 
-    @Config("killbill.security.ldap.systemPassword")
+    @Config("org.killbill.security.ldap.systemPassword")
     @DefaultNull
     @Description("LDAP password")
     public String getShiroLDAPSystemPassword();
 
-    @Config("killbill.security.ldap.authenticationMechanism")
+    @Config("org.killbill.security.ldap.authenticationMechanism")
     @Default("simple")
     @Description("LDAP authentication mechanism (e.g. DIGEST-MD5)")
     public String getShiroLDAPAuthenticationMechanism();
 
-    @Config("killbill.security.ldap.disableSSLCheck")
+    @Config("org.killbill.security.ldap.disableSSLCheck")
     @Default("false")
     @Description("Whether to ignore SSL certificates checks")
     public boolean disableShiroLDAPSSLCheck();

diff --git a/util/src/main/java/org/killbill/billing/util/email/EmailConfig.java b/util/src/main/java/org/killbill/billing/util/email/EmailConfig.java
index 503542e..edcfdea 100644
--- a/util/src/main/java/org/killbill/billing/util/email/EmailConfig.java
+++ b/util/src/main/java/org/killbill/billing/util/email/EmailConfig.java
@@ -25,42 +25,42 @@ import org.killbill.billing.util.config.KillbillConfig;
 
 public interface EmailConfig extends KillbillConfig {
 
-    @Config("killbill.mail.smtp.host")
+    @Config("org.killbill.mail.smtp.host")
     @DefaultNull
     @Description("MTA host used for email notifications")
     public String getSmtpServerName();
 
-    @Config("killbill.mail.smtp.port")
+    @Config("org.killbill.mail.smtp.port")
     @DefaultNull
     @Description("MTA port used for email notifications")
     public int getSmtpPort();
 
-    @Config("killbill.mail.smtp.auth")
+    @Config("org.killbill.mail.smtp.auth")
     @Default("false")
     @Description("Whether to authenticate against the MTA")
     public boolean useSmtpAuth();
 
-    @Config("killbill.mail.smtp.user")
+    @Config("org.killbill.mail.smtp.user")
     @DefaultNull
     @Description("Username to use to authenticate against the MTA")
     public String getSmtpUserName();
 
-    @Config("killbill.mail.smtp.password")
+    @Config("org.killbill.mail.smtp.password")
     @DefaultNull
     @Description("Password to use to authenticate against the MTA")
     public String getSmtpPassword();
 
-    @Config("killbill.mail.from")
+    @Config("org.killbill.mail.from")
     @Default("support@example.com")
     @Description("Default From: field for email notifications")
     String getDefaultFrom();
 
-    @Config("killbill.mail.useSSL")
+    @Config("org.killbill.mail.useSSL")
     @Default("false")
     @Description("Whether to use secure SMTP")
     boolean useSSL();
 
-    @Config("killbill.mail.invoiceEmailSubject")
+    @Config("org.killbill.mail.invoiceEmailSubject")
     @Default("Your invoice")
     @Description("Default Subject: field for invoice notifications")
     String getInvoiceEmailSubject();

diff --git a/util/src/test/java/org/killbill/billing/KillbillConfigSource.java b/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
index f5da140..65789a2 100644
--- a/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
+++ b/util/src/test/java/org/killbill/billing/KillbillConfigSource.java
@@ -35,10 +35,10 @@ public class KillbillConfigSource implements ConfigSource {
         this.properties.put("user.timezone", "UTC");
 
         // Speed up the notification queue
-        this.properties.put("killbill.billing.notificationq.main.sleep", "100");
+        this.properties.put("org.killbill.notificationq.main.sleep", "100");
         // Speed up the bus
-        this.properties.put("killbill.billing.persistent.bus.main.sleep", "100");
-        this.properties.put("killbill.billing.persistent.bus.main.nbThreads", "1");
+        this.properties.put("org.killbill.persistent.bus.main.sleep", "100");
+        this.properties.put("org.killbill.persistent.bus.main.nbThreads", "1");
     }
 
     public String getString(final String propertyName) {

diff --git a/util/src/test/java/org/killbill/billing/util/email/DefaultCatalogTranslationTest.java b/util/src/test/java/org/killbill/billing/util/email/DefaultCatalogTranslationTest.java
index 108fcf6..f281f3d 100644
--- a/util/src/test/java/org/killbill/billing/util/email/DefaultCatalogTranslationTest.java
+++ b/util/src/test/java/org/killbill/billing/util/email/DefaultCatalogTranslationTest.java
@@ -40,7 +40,7 @@ public class DefaultCatalogTranslationTest extends UtilTestSuiteNoDB {
     public void beforeClass() throws Exception {
         super.beforeClass();
         final ConfigSource configSource = new ConfigSource() {
-            private final Map<String, String> properties = ImmutableMap.<String, String>of("killbill.template.invoiceFormatterFactoryClass",
+            private final Map<String, String> properties = ImmutableMap.<String, String>of("org.killbill.template.invoiceFormatterFactoryClass",
                                                                                            "org.killbill.billing.mock.MockInvoiceFormatterFactory");
 
             @Override

diff --git a/util/src/test/java/org/killbill/billing/util/security/shiro/realm/TestKillBillJndiLdapRealm.java b/util/src/test/java/org/killbill/billing/util/security/shiro/realm/TestKillBillJndiLdapRealm.java
index eef91da..262a5a7 100644
--- a/util/src/test/java/org/killbill/billing/util/security/shiro/realm/TestKillBillJndiLdapRealm.java
+++ b/util/src/test/java/org/killbill/billing/util/security/shiro/realm/TestKillBillJndiLdapRealm.java
@@ -56,16 +56,16 @@ public class TestKillBillJndiLdapRealm extends UtilTestSuiteNoDB {
     public void testCheckLDAPConnection() throws Exception {
         // Convenience method to verify your LDAP connectivity
         final Properties props = new Properties();
-        props.setProperty("killbill.security.ldap.userDnTemplate", "uid={0},ou=users,dc=mycompany,dc=com");
-        props.setProperty("killbill.security.ldap.searchBase", "ou=groups,dc=mycompany,dc=com");
-        props.setProperty("killbill.security.ldap.groupSearchFilter", "memberOf=uid={0},ou=users,dc=mycompany,dc=com");
-        props.setProperty("killbill.security.ldap.groupNameId", "cn");
-        props.setProperty("killbill.security.ldap.url", "ldap://ldap:389");
-        props.setProperty("killbill.security.ldap.disableSSLCheck", "true");
-        props.setProperty("killbill.security.ldap.systemUsername", "cn=root");
-        props.setProperty("killbill.security.ldap.systemPassword", "password");
-        props.setProperty("killbill.security.ldap.authenticationMechanism", "simple");
-        props.setProperty("killbill.security.ldap.permissionsByGroup", "support-group: entitlement:*\n" +
+        props.setProperty("org.killbill.security.ldap.userDnTemplate", "uid={0},ou=users,dc=mycompany,dc=com");
+        props.setProperty("org.killbill.security.ldap.searchBase", "ou=groups,dc=mycompany,dc=com");
+        props.setProperty("org.killbill.security.ldap.groupSearchFilter", "memberOf=uid={0},ou=users,dc=mycompany,dc=com");
+        props.setProperty("org.killbill.security.ldap.groupNameId", "cn");
+        props.setProperty("org.killbill.security.ldap.url", "ldap://ldap:389");
+        props.setProperty("org.killbill.security.ldap.disableSSLCheck", "true");
+        props.setProperty("org.killbill.security.ldap.systemUsername", "cn=root");
+        props.setProperty("org.killbill.security.ldap.systemPassword", "password");
+        props.setProperty("org.killbill.security.ldap.authenticationMechanism", "simple");
+        props.setProperty("org.killbill.security.ldap.permissionsByGroup", "support-group: entitlement:*\n" +
                                                                        "finance-group: invoice:*, payment:*\n" +
                                                                        "ops-group: *:*");
         final ConfigSource customConfigSource = new SimplePropertyConfigSource(props);