diff --git a/README.md b/README.md
index 14ac847..359890b 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,15 @@ The more common usage of the library is opt-in automatic Spring Boot configurati
 * Adds a `PropertySource` with binding-specific Spring Boot configuration properties.
 
 ## Auto-Configurations
-Each auto-configuration is triggered by the type of binding.  Each auto-configuration can be disabled using a System Property specific to that type and defaults to enable. Auto-configuration is disabled by default and can be enabled by setting the `org.springframework.cloud.bindings.boot.enable` System Property to `true`.
+Each auto-configuration is triggered by the type of binding.  Each auto-configuration can be disabled using a System Property specific to that type and defaults to enable. Auto-configuration is disabled by default and can be enabled by setting the `org.springframework.cloud.bindings.boot.enabled` System Property to `true`.
 
 `{<key>}` indicates that the value is the contents of the secret with the given key.
 
+> **_NOTE:_** Legacy property key suffix `*.enable` is supported but deprecated in favor of `*.enabled`.
+
 ### ActiveMQ Artemis
 Type: `artemis`
-Disable Property: `org.springframework.cloud.bindings.boot.artemis.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.artemis.enabled`
 
 #### Properties
 
@@ -70,7 +72,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.artemis.enable`
 
 ### Cassandra
 Type: `cassandra`
-Disable Property: `org.springframework.cloud.bindings.boot.cassandra.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.cassandra.enabled`
 
 #### Properties
 
@@ -91,7 +93,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.cassandra.enable`
 
 ### Couchbase
 Type: `couchbase`
-Disable Property: `org.springframework.cloud.bindings.boot.couchbase.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.couchbase.enabled`
 
 #### Properties
 
@@ -104,7 +106,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.couchbase.enable`
 
 ### DB2 RDBMS
 Type: `db2`
-Disable Property: `org.springframework.cloud.bindings.boot.db2.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.db2.enabled`
 
 | Property                              | Value                                                                                                                                        |
 | ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -119,7 +121,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.db2.enable`
 
 ### Elasticsearch
 Type: `elasticsearch`
-Disable Property: `org.springframework.cloud.bindings.boot.elasticsearch.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.elasticsearch.enabled`
 
 #### Properties
 
@@ -131,7 +133,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.elasticsearch.enable`
 
 ### Kafka
 Type: `kafka`
-Disable Property: `org.springframework.cloud.bindings.boot.kafka.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.kafka.enabled`
 
 | Property                                  | Value                          |
 | ----------------------------------------- | ------------------------------ |
@@ -142,7 +144,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.kafka.enable`
 
 ### LDAP
 Type: `ldap`
-Disable Property: `org.springframework.cloud.bindings.boot.ldap.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.ldap.enabled`
 
 | Property               | Value        |
 | ---------------------- | ------------ |
@@ -153,7 +155,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.ldap.enable`
 
 ### MongoDB
 Type: `mongodb`
-Disable Property: `org.springframework.cloud.bindings.boot.mongodb.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.mongodb.enabled`
 
 | Property                                      | Value                       |
 | --------------------------------------------- | --------------------------- |
@@ -168,7 +170,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.mongodb.enable`
 
 ### MySQL RDBMS
 Type: `mysql`
-Disable Property: `org.springframework.cloud.bindings.boot.mysql.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.mysql.enabled`
 
 | Property                              | Value                                                                                                                                                                                                              |
 | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -184,7 +186,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.mysql.enable`
 
 ### Neo4J
 Type: `neo4j`
-Disable Property: `org.springframework.cloud.bindings.boot.neo4j.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.neo4j.enabled`
 
 #### Properties
 
@@ -196,7 +198,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.neo4j.enable`
 
 ### Oracle RDBMS
 Type: `oracle`
-Disable Property: `org.springframework.cloud.bindings.boot.oracle.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.oracle.enabled`
 
 | Property                              | Value                                                                                                                                           |
 | ------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -210,7 +212,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.oracle.enable`
 
 ### PostgreSQL RDBMS
 Type: `postgresql`
-Disable Property: `org.springframework.cloud.bindings.boot.postgresql.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.postgresql.enabled`
 
 | Property                              | Value                                                                                                                                                                                                                                                                              |
 | ------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -224,7 +226,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.postgresql.enable`
 
 ### RabbitMQ
 Type: `rabbitmq`
-Disable Property: `org.springframework.cloud.bindings.boot.rabbitmq.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.rabbitmq.enabled`
 
 | Property                       | Value            |
 | ------------------------------ | ---------------- |
@@ -237,7 +239,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.rabbitmq.enable`
 
 ### Redis
 Type: `redis`
-Disable Property: `org.springframework.cloud.bindings.boot.redis.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.redis.enabled`
 
 #### Properties
 
@@ -257,7 +259,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.redis.enable`
 
 ### SAP Hana
 Type: `hana`
-Disable Property: `org.springframework.cloud.bindings.boot.hana.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.hana.enabled`
 
 | Property                              | Value                                                                                                                                        |
 | ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -271,7 +273,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.hana.enable`
 
 ## SCS Config Server
 Type: `config`
-Disable Property: `org.springframework.cloud.bindings.boot.config.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.config.enabled`
 
 | Property                                             | Value                                                  |
 |------------------------------------------------------|--------------------------------------------------------|
@@ -292,7 +294,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.config.enable`
 ## SCS Eureka
 
 Type: `eureka`
-Disable Property: `org.springframework.cloud.bindings.boot.eureka.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.eureka.enabled`
 
 | Property                                 | Value                                                              |
 |------------------------------------------|--------------------------------------------------------------------|
@@ -317,7 +319,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.eureka.enable`
 
 ## Spring Security OAuth2
 Type: `oauth2`
-Disable Property: `org.springframework.cloud.bindings.boot.oauth2.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.oauth2.enabled`
 
 | Property                                                                            | Value                                                                                                                         |
 | ----------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------- |
@@ -339,7 +341,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.oauth2.enable`
 
 ### SQLServer RDBMS
 Type: `sqlserver`
-Disable Property: `org.springframework.cloud.bindings.boot.sqlserver.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.sqlserver.enabled`
 
 | Property                              | Value                                                                                                                                              |
 | ------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -354,7 +356,7 @@ Disable Property: `org.springframework.cloud.bindings.boot.sqlserver.enable`
 
 ### Vault
 Type: `vault`
-Disable Property: `org.springframework.cloud.bindings.boot.vault.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.vault.enabled`
 
 Any Provider:
 
@@ -455,7 +457,7 @@ If `{authentication-method}` is equal to `token`:
 ### Wavefront
 
 Type: `wavefront`
-Disable Property: `org.springframework.cloud.bindings.boot.wavefront.enable`
+Disable Property: `org.springframework.cloud.bindings.boot.wavefront.enabled`
 
 | Property                                        | Value         |
 | ----------------------------------------------- | ------------- |
@@ -489,7 +491,7 @@ public final class MyServiceBindingsPropertiesProcessor implements BindingsPrope
 
     @Override
     public void process(Environment environment, Bindings bindings, Map<String, Object> properties) {
-        if (!environment.getProperty("com.example.bindings.myservice.enable", Boolean.class, true)) {
+        if (!environment.getProperty("com.example.bindings.myservice.enabled", Boolean.class, true)) {
             return;
         }
         List<Binding> myBindings = bindings.filterBindings(TYPE);
@@ -505,7 +507,7 @@ public final class MyServiceBindingsPropertiesProcessor implements BindingsPrope
 
 These lines from the above example allow users to set `com.example.bindings.myservice.enable=false` to disable the processor entirely:
 ```
-        if (!environment.getProperty("com.example.bindings.myservice.enable", Boolean.class, true)) {
+        if (!environment.getProperty("com.example.bindings.myservice.enabled", Boolean.class, true)) {
             return;
         }
 ```
diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java
index f7c858b..0f8ba2c 100644
--- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java
+++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/Guards.java
@@ -20,14 +20,16 @@
 
 final class Guards {
 
+    static final String CONFIGURATION_KEY_PREFIX = "org.springframework.cloud.bindings.boot.";
+
     static boolean isGlobalEnabled(Environment environment) {
-        return environment.getProperty("org.springframework.cloud.bindings.boot.enable", Boolean.class, true);
+        return environment.getProperty(CONFIGURATION_KEY_PREFIX + "enable", Boolean.class,
+                environment.getProperty(CONFIGURATION_KEY_PREFIX + "enabled", Boolean.class, true));
     }
 
     static boolean isTypeEnabled(Environment environment, String type) {
-        return environment.getProperty(
-                String.format("org.springframework.cloud.bindings.boot.%s.enable", type),
-                Boolean.class, true);
+        return environment.getProperty(String.format(CONFIGURATION_KEY_PREFIX + "%s.enable", type), Boolean.class,
+                environment.getProperty(String.format(CONFIGURATION_KEY_PREFIX + "%s.enabled", type), Boolean.class, true));
     }
 
 }
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java
index 78ad63b..2bd8552 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ArtemisBindingsPropertiesProcessorTest.java
@@ -61,7 +61,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.artemis.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.artemis.enabled", "false");
 
         new ArtemisBindingsPropertiesProcessor().process(environment, bindingsSpringBoot3, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java
index 33bed83..ca0023b 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingFlattenedEnvironmentPostProcessorTest.java
@@ -35,7 +35,7 @@ final class BindingFlattenedEnvironmentPostProcessorTest {
     private final SpringApplication application = new SpringApplication();
 
     private final MockEnvironment environment = new MockEnvironment()
-            .withProperty("org.springframework.cloud.bindings.boot.enable", "true");
+            .withProperty("org.springframework.cloud.bindings.boot.enabled", "true");
 
     @Test
     @DisplayName("is disabled by default")
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java
index 85a7d7b..0da0557 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/BindingSpecificEnvironmentPostProcessorTest.java
@@ -35,7 +35,7 @@ final class BindingSpecificEnvironmentPostProcessorTest {
     private final SpringApplication application = new SpringApplication();
 
     private final MockEnvironment environment = new MockEnvironment()
-            .withProperty("org.springframework.cloud.bindings.boot.enable", "true");
+            .withProperty("org.springframework.cloud.bindings.boot.enabled", "true");
 
     @Test
     @DisplayName("is disabled by default")
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java
index c64b4ba..42528fb 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CassandraBindingsPropertiesProcessorTest.java
@@ -77,7 +77,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.cassandra.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.cassandra.enabled", "false");
 
         new CassandraBindingsPropertiesProcessor().process(environment, bindings, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java
index ee9b12d..6172605 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ConfigServerBindingsPropertiesProcessorTest.java
@@ -77,7 +77,7 @@ void whenEnabled() {
     @Test
     @DisplayName("can be disabled")
     void whenDisabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.config.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.config.enabled", "false");
 
         new ConfigServerBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java
index 7fde0f8..427ba0b 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/CouchbaseBindingsPropertiesProcessorTest.java
@@ -61,7 +61,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.couchbase.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.couchbase.enabled", "false");
 
         new CouchbaseBindingsPropertiesProcessor().process(environment, bindingsSpringBoot3, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java
index 58b4125..073155c 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Db2BindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.db2.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.db2.enabled", "false");
 
         new Db2BindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java
index 24ac8c0..388711c 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/ElasticsearchBindingsPropertiesProcessorTest.java
@@ -60,7 +60,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.elasticsearch.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.elasticsearch.enabled", "false");
 
         new ElasticsearchBindingsPropertiesProcessor().process(environment, bindingsSpringBoot3, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java
index ab40c03..f8cf311 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/EurekaBindingsPropertiesProcessorTest.java
@@ -320,7 +320,7 @@ void doesNotOverridePreferIpAddressInKubernetes() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.eureka.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.eureka.enabled", "false");
 
         new KafkaBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java
index f221962..0686c8c 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/GuardsTest.java
@@ -41,19 +41,33 @@ void unset() {
         }
 
         @Test
-        @DisplayName("returns the set value of true")
+        @DisplayName("returns the set enable value of true")
         void setTrue() {
             environment.setProperty("org.springframework.cloud.bindings.boot.enable", "true");
             assertThat(isGlobalEnabled(environment)).isTrue();
         }
 
         @Test
-        @DisplayName("returns the set value of false")
+        @DisplayName("returns the set enable value of false")
         void setFalse() {
             environment.setProperty("org.springframework.cloud.bindings.boot.enable", "false");
             assertThat(isGlobalEnabled(environment)).isFalse();
         }
 
+        @Test
+        @DisplayName("returns the set enabled value of true")
+        void setEnabledTrue() {
+            environment.setProperty("org.springframework.cloud.bindings.boot.enabled", "true");
+            assertThat(isGlobalEnabled(environment)).isTrue();
+        }
+
+        @Test
+        @DisplayName("returns the set enabled value of false")
+        void setEnabledFalse() {
+            environment.setProperty("org.springframework.cloud.bindings.boot.enabled", "false");
+            assertThat(isGlobalEnabled(environment)).isFalse();
+        }
+
     }
 
     @Nested
@@ -69,19 +83,34 @@ void unset() {
         }
 
         @Test
-        @DisplayName("returns the set value of true")
+        @DisplayName("returns the set enable value of true")
         void setTrue() {
             environment.setProperty("org.springframework.cloud.bindings.boot.test.enable", "true");
             assertThat(isTypeEnabled(environment, "Test")).isTrue();
         }
 
         @Test
-        @DisplayName("returns the set value of false")
+        @DisplayName("returns the set enable value of false")
         void setFalse() {
             environment.setProperty("org.springframework.cloud.bindings.boot.test.enable", "false");
             assertThat(isTypeEnabled(environment, "test")).isFalse();
         }
 
+
+        @Test
+        @DisplayName("returns the set enabled value of true")
+        void setEnabledTrue() {
+            environment.setProperty("org.springframework.cloud.bindings.boot.test.enabled", "true");
+            assertThat(isTypeEnabled(environment, "Test")).isTrue();
+        }
+
+        @Test
+        @DisplayName("returns the set enabled value of false")
+        void setEnabledFalse() {
+            environment.setProperty("org.springframework.cloud.bindings.boot.test.enabled", "false");
+            assertThat(isTypeEnabled(environment, "test")).isFalse();
+        }
+
     }
 
 }
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java
index fd55178..c77588a 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/KafkaBindingsPropertiesProcessorTest.java
@@ -61,7 +61,7 @@ void test() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.kafka.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.kafka.enabled", "false");
 
         new KafkaBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java
index c4afe7e..98b539d 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/LDAPBindingsPropertiesProcessorTest.java
@@ -61,7 +61,7 @@ void testJdbc() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.ldap.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.ldap.enabled", "false");
 
         new OracleBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java
index bd35a9f..e3603ac 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MongoDbBindingsPropertiesProcessorTest.java
@@ -69,7 +69,7 @@ void test() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.mongodb.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.mongodb.enabled", "false");
 
         new MongoDbBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java
index 52e0acb..b822b99 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.mysql.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.mysql.enabled", "false");
 
         new MySqlBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java
index 9eab145..40497c1 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/Neo4JBindingsPropertiesProcessorTest.java
@@ -59,7 +59,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.neo4j.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.neo4j.enabled", "false");
 
         new Neo4JBindingsPropertiesProcessor().process(environment, bindings, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java
index 9a0847d..22eb824 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/OracleBindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.oracle.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.oracle.enabled", "false");
 
         new OracleBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java
index f083fbb..f3d5a64 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.postgresql.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.postgresql.enabled", "false");
 
         new PostgreSqlBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java
index 6fb1398..268c603 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RabbitMqBindingsPropertiesProcessorTest.java
@@ -65,7 +65,7 @@ void test() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.rabbitmq.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.rabbitmq.enabled", "false");
 
         new RabbitMqBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java
index d47833e..b8f6164 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/RedisBindingsPropertiesProcessorTest.java
@@ -76,7 +76,7 @@ void testSb3() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.redis.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.redis.enabled", "false");
 
         new RedisBindingsPropertiesProcessor().process(environment, bindings, properties);
         assertThat(properties).isEmpty();
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java
index 394f218..cd5b12f 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SapHanaBindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.hana.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.hana.enabled", "false");
 
         new SapHanaBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java
index db39e80..eb0e20d 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SpringSecurityOAuth2BindingsPropertiesProcessorTest.java
@@ -212,7 +212,7 @@ void testRedirectUriAndRedirectUris() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.oauth2.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.oauth2.enabled", "false");
 
         new SpringSecurityOAuth2BindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java
index 6e9741b..b863660 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/SqlServerBindingsPropertiesProcessorTest.java
@@ -104,7 +104,7 @@ void disabled() {
         Bindings bindings = new Bindings(
                 new Binding("test-name", Paths.get("test-path"), secret)
         );
-        environment.setProperty("org.springframework.cloud.bindings.boot.sqlserver.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.sqlserver.enabled", "false");
 
         new SqlServerBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java
index e8ea374..c60f102 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/VaultBindingsPropertiesProcessorTest.java
@@ -303,7 +303,7 @@ void disabled() {
                 )
         );
 
-        environment.setProperty("org.springframework.cloud.bindings.boot.vault.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.vault.enabled", "false");
 
         new VaultBindingsPropertiesProcessor().process(environment, bindings, properties);
 
diff --git a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java
index aa01a5b..29d12e3 100644
--- a/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java
+++ b/spring-cloud-bindings/src/test/java/org/springframework/cloud/bindings/boot/WavefrontBindingsPropertiesProcessorTest.java
@@ -57,7 +57,7 @@ void test() {
     @Test
     @DisplayName("can be disabled")
     void disabled() {
-        environment.setProperty("org.springframework.cloud.bindings.boot.wavefront.enable", "false");
+        environment.setProperty("org.springframework.cloud.bindings.boot.wavefront.enabled", "false");
 
         new WavefrontBindingsPropertiesProcessor().process(environment, bindings, properties);