diff --git a/activemq/src/main/resources/application.properties b/activemq/src/main/resources/application.properties
index 4180a58f9..a66be4a32 100644
--- a/activemq/src/main/resources/application.properties
+++ b/activemq/src/main/resources/application.properties
@@ -15,7 +15,7 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 
 # This configures Springs default ActiveMQConnectionFactory that is 
 # created by Spring Boot AutoConfiguration unless ActiveMQAutoConfiguration
diff --git a/amqp/src/main/resources/application.properties b/amqp/src/main/resources/application.properties
index eb1dcce97..52951b7b2 100644
--- a/amqp/src/main/resources/application.properties
+++ b/amqp/src/main/resources/application.properties
@@ -15,7 +15,7 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 
 # JMS ConnectionFactory configuration
 AMQP_REMOTE_URI=amqp://localhost:5672
diff --git a/aot-basic/src/main/resources/application.properties b/aot-basic/src/main/resources/application.properties
index 762e0f9b8..bb247ccdd 100644
--- a/aot-basic/src/main/resources/application.properties
+++ b/aot-basic/src/main/resources/application.properties
@@ -23,9 +23,9 @@ logging.level.sample.camel = DEBUG
 
 camel.main.name = MyCamelNative
 
-camel.springboot.main-run-controller: true
+camel.main.run-controller: true
 
-camel.springboot.routes-include-pattern: file:${user.dir}/routes/*.yaml,file:${user.dir}/routes/*.xml
+camel.main.routes-include-pattern: file:${user.dir}/routes/*.yaml,file:${user.dir}/routes/*.xml
 
 # what to say
 greeting: Hello World
diff --git a/arangodb/src/main/resources/application.properties b/arangodb/src/main/resources/application.properties
index 45be295bb..3330a94bd 100644
--- a/arangodb/src/main/resources/application.properties
+++ b/arangodb/src/main/resources/application.properties
@@ -15,7 +15,7 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 camel.main.name=ArangoDB
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 camel.component.arangodb.documentCollection=foo
 camel.component.arangodb.user=root
 camel.component.arangodb.password=openSesame
diff --git a/artemis/src/main/resources/application.properties b/artemis/src/main/resources/application.properties
index 7f3f0fba2..3858b7fde 100644
--- a/artemis/src/main/resources/application.properties
+++ b/artemis/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 ## ---------------------------------------------------------------------------
 
 #You can use this property to override the default autowired broker-url
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 #spring.artemis.mode=native
 spring.artemis.mode=embedded
 spring.artemis.host=localhost
diff --git a/aws-secrets-manager/src/main/resources/application.properties b/aws-secrets-manager/src/main/resources/application.properties
index d0eb22817..76ba97bd4 100644
--- a/aws-secrets-manager/src/main/resources/application.properties
+++ b/aws-secrets-manager/src/main/resources/application.properties
@@ -18,7 +18,7 @@
 camel.vault.aws.accessKey=<accessKey>
 camel.vault.aws.secretKey=<secretKey>
 camel.vault.aws.region=<region>
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 logging.config=classpath:logback.xml
 stock=AMZN
 
diff --git a/aws2-s3/src/main/resources/application.properties b/aws2-s3/src/main/resources/application.properties
index fb7b35387..ce973df48 100644
--- a/aws2-s3/src/main/resources/application.properties
+++ b/aws2-s3/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 camel.component.aws2-s3.accessKey=xxxx
 camel.component.aws2-s3.secretKey=yyyy
 camel.component.aws2-s3.region=region
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 logging.config=classpath:logback.xml
 bucketName=camel-kafka-connector
 
diff --git a/fhir-auth-tx/src/main/resources/application.properties b/fhir-auth-tx/src/main/resources/application.properties
index adaa5d41c..dcb3aaf5d 100644
--- a/fhir-auth-tx/src/main/resources/application.properties
+++ b/fhir-auth-tx/src/main/resources/application.properties
@@ -29,11 +29,11 @@ camel.main.name = MyCamel
 server.port=0
 
 # to automatic shutdown the JVM after a period of time
-#camel.springboot.duration-max-seconds=60
-#camel.springboot.duration-max-messages=100
+#camel.main.duration-max-seconds=60
+#camel.main.duration-max-messages=100
 
 # add for example: &repeatCount=5 to the timer endpoint to make Camel idle
-#camel.springboot.duration-max-idle-seconds=15
+#camel.main.duration-max-idle-seconds=15
 
 # expose actuator endpoint via HTTP
 management.endpoints.web.exposure.include=info,health
diff --git a/fhir/src/main/resources/application.properties b/fhir/src/main/resources/application.properties
index 286a3a1b0..56a671b52 100644
--- a/fhir/src/main/resources/application.properties
+++ b/fhir/src/main/resources/application.properties
@@ -25,11 +25,11 @@ input=target/work/fhir/input
 camel.main.name = MyCamel
 
 # to automatic shutdown the JVM after a period of time
-#camel.springboot.duration-max-seconds=60
-#camel.springboot.duration-max-messages=100
+#camel.main.duration-max-seconds=60
+#camel.main.duration-max-messages=100
 
 # add for example: &repeatCount=5 to the timer endpoint to make Camel idle
-#camel.springboot.duration-max-idle-seconds=15
+#camel.main.duration-max-idle-seconds=15
 
 # expose actuator endpoint via HTTP
 management.endpoints.web.exposure.include=info,health
diff --git a/health-checks/src/main/resources/application.properties b/health-checks/src/main/resources/application.properties
index 58acf849a..056681340 100644
--- a/health-checks/src/main/resources/application.properties
+++ b/health-checks/src/main/resources/application.properties
@@ -36,7 +36,7 @@ management.endpoint.health.show-details=always
 camel.main.name = MyCamel
 
 # enable JMX which allows to also control health check
-camel.springboot.jmx-enabled = true
+camel.main.jmx-enabled = true
 
 # properties used in the route
 myPeriod = 10s
diff --git a/infinispan/src/main/resources/application.properties b/infinispan/src/main/resources/application.properties
index 9dbafc5f1..1978656c1 100644
--- a/infinispan/src/main/resources/application.properties
+++ b/infinispan/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 ## ---------------------------------------------------------------------------
 
 camel.main.name=Infinispan
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 camel.component.infinispan.hosts=localhost:11222
 camel.component.infinispan.username=admin
 camel.component.infinispan.password=password
diff --git a/jolokia/src/main/resources/application.properties b/jolokia/src/main/resources/application.properties
index 77eda11b5..f4d859e11 100644
--- a/jolokia/src/main/resources/application.properties
+++ b/jolokia/src/main/resources/application.properties
@@ -25,11 +25,11 @@ greeting = Hello World
 timer.period = 2000
 
 # to automatic shutdown the JVM after a period of time
-#camel.springboot.duration-max-seconds=60
-#camel.springboot.duration-max-messages=100
+#camel.main.duration-max-seconds=60
+#camel.main.duration-max-messages=100
 
 # add for example: &repeatCount=5 to the timer endpoint to make Camel idle
-#camel.springboot.duration-max-idle-seconds=15
+#camel.main.duration-max-idle-seconds=15
 
 # expose actuator endpoint via HTTP
 management.endpoints.web.exposure.include=info,health,camelroutes
diff --git a/kamelet-chucknorris/src/main/resources/application.yaml b/kamelet-chucknorris/src/main/resources/application.yaml
index 5085a108b..ddde15a86 100644
--- a/kamelet-chucknorris/src/main/resources/application.yaml
+++ b/kamelet-chucknorris/src/main/resources/application.yaml
@@ -19,4 +19,4 @@ camel:
   main:
     name: ChuckCamel
     # keep the application running
-    main-run-controller: true
+    run-controller: true
diff --git a/mail-ms-exchange-oauth2/src/main/resources/application.properties b/mail-ms-exchange-oauth2/src/main/resources/application.properties
index 8a8ce36c9..785c8c617 100644
--- a/mail-ms-exchange-oauth2/src/main/resources/application.properties
+++ b/mail-ms-exchange-oauth2/src/main/resources/application.properties
@@ -18,7 +18,7 @@
 camel.main.name: CamelMailExchangeOAuth2
 
 # Keep the application running
-camel.springboot.main-run-controller: true
+camel.main.run-controller: true
 
 
 # Azure Active Directory tenant ID
diff --git a/master/src/main/resources/application-file.properties b/master/src/main/resources/application-file.properties
index ffa36d095..cdb6575c7 100644
--- a/master/src/main/resources/application-file.properties
+++ b/master/src/main/resources/application-file.properties
@@ -22,7 +22,7 @@ management.endpoints.enabled-by-default = false
 management.endpoints.jmx.enabled = false
 management.endpoint.health.enabled = true
 
-camel.springboot.jmx-enabled = false
+camel.main.jmx-enabled = false
 
 management.server.port = -1
 
diff --git a/master/src/main/resources/application.properties b/master/src/main/resources/application.properties
index b1ce9f231..f0ea60b7d 100644
--- a/master/src/main/resources/application.properties
+++ b/master/src/main/resources/application.properties
@@ -28,5 +28,5 @@ logging.level.org.apache.camel.component.master = DEBUG
 logging.level.org.apache.camel.examples.cluster = DEBUG
 
 camel.main.name = SampleClusteredRouteController
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 
diff --git a/observation/client/src/main/resources/application.properties b/observation/client/src/main/resources/application.properties
index d68b6c470..1a7d94285 100644
--- a/observation/client/src/main/resources/application.properties
+++ b/observation/client/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name=Client
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 
 spring.application.name=${camel.main.name}
 management.tracing.sampling.probability=1.0
diff --git a/observation/service1/src/main/resources/application.properties b/observation/service1/src/main/resources/application.properties
index 4b55ba31c..3cd2d9316 100644
--- a/observation/service1/src/main/resources/application.properties
+++ b/observation/service1/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name=Service1
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 
 spring.application.name=${camel.main.name}
 management.tracing.sampling.probability=1.0
diff --git a/observation/service2/src/main/resources/application.properties b/observation/service2/src/main/resources/application.properties
index 43c133e77..6ae303318 100644
--- a/observation/service2/src/main/resources/application.properties
+++ b/observation/service2/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name=Service2
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 
 spring.application.name=${camel.main.name}
 management.tracing.sampling.probability=1.0
diff --git a/opentelemetry/CarBooking/src/main/resources/application.properties b/opentelemetry/CarBooking/src/main/resources/application.properties
index fe4e779e9..19706d1b4 100644
--- a/opentelemetry/CarBooking/src/main/resources/application.properties
+++ b/opentelemetry/CarBooking/src/main/resources/application.properties
@@ -14,8 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-camel.springboot.main-run-controller=true
-camel.springboot.use-mdc-logging = true
+camel.main.run-controller=true
+camel.main.use-mdc-logging = true
 camel.component.micrometer.enabled=true
 camel.component.metrics.metric-registry=prometheusMeterRegistry
 camel.metrics.enable-message-history=true
diff --git a/opentelemetry/FlightBooking/src/main/resources/application.properties b/opentelemetry/FlightBooking/src/main/resources/application.properties
index fe5e78dba..e593653b6 100644
--- a/opentelemetry/FlightBooking/src/main/resources/application.properties
+++ b/opentelemetry/FlightBooking/src/main/resources/application.properties
@@ -14,8 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-camel.springboot.main-run-controller=true
-camel.springboot.use-mdc-logging = true
+camel.main.run-controller=true
+camel.main.use-mdc-logging = true
 camel.component.micrometer.enabled=true
 camel.component.metrics.metric-registry=prometheusMeterRegistry
 camel.metrics.enable-message-history=true
diff --git a/opentelemetry/HotelBooking/src/main/resources/application.properties b/opentelemetry/HotelBooking/src/main/resources/application.properties
index 9bf4e1f45..8dab5f414 100644
--- a/opentelemetry/HotelBooking/src/main/resources/application.properties
+++ b/opentelemetry/HotelBooking/src/main/resources/application.properties
@@ -14,8 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-camel.springboot.main-run-controller=true
-camel.springboot.use-mdc-logging = true
+camel.main.run-controller=true
+camel.main.use-mdc-logging = true
 camel.component.micrometer.enabled=true
 camel.component.metrics.metric-registry=prometheusMeterRegistry
 camel.metrics.enable-message-history=true
diff --git a/opentelemetry/TripBooking/src/main/resources/application.properties b/opentelemetry/TripBooking/src/main/resources/application.properties
index 1ef168ad6..aa932c297 100644
--- a/opentelemetry/TripBooking/src/main/resources/application.properties
+++ b/opentelemetry/TripBooking/src/main/resources/application.properties
@@ -14,8 +14,8 @@
 ## See the License for the specific language governing permissions and
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
-camel.springboot.main-run-controller=true
-camel.springboot.use-mdc-logging = true
+camel.main.run-controller=true
+camel.main.use-mdc-logging = true
 camel.component.micrometer.enabled=true
 camel.component.metrics.metric-registry=prometheusMeterRegistry
 camel.metrics.enable-message-history=true
diff --git a/pojo/src/main/resources/application.properties b/pojo/src/main/resources/application.properties
index 0950b01d9..d146ebd5e 100644
--- a/pojo/src/main/resources/application.properties
+++ b/pojo/src/main/resources/application.properties
@@ -19,7 +19,7 @@
 camel.main.name = PojoExample
 
 # keep camel running
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 
 # automatic shutdown after 60 seconds
-camel.springboot.duration-max-seconds = 60
+camel.main.duration-max-seconds = 60
diff --git a/quartz/src/main/resources/application.properties b/quartz/src/main/resources/application.properties
index 0831af8be..ea7e9d1ca 100644
--- a/quartz/src/main/resources/application.properties
+++ b/quartz/src/main/resources/application.properties
@@ -19,7 +19,7 @@
 camel.main.name = Quartz-to-Log
 
 # keep camel running
-camel.springboot.main-run-controller = true
+camel.main.run-controller = true
 
 # automatic shutdown after 60 seconds
-camel.springboot.duration-max-seconds = 60
+camel.main.duration-max-seconds = 60
diff --git a/rabbitmq/src/main/resources/application.properties b/rabbitmq/src/main/resources/application.properties
index 3641748cd..50a25f0b0 100644
--- a/rabbitmq/src/main/resources/application.properties
+++ b/rabbitmq/src/main/resources/application.properties
@@ -19,8 +19,8 @@
 camel.main.name = RabbitCamel
 
 # to automatic shutdown the JVM after a period of time
-#camel.springboot.duration-max-seconds=60
-#camel.springboot.duration-max-messages=100
+#camel.main.duration-max-seconds=60
+#camel.main.duration-max-messages=100
 
 # properties used in the Camel route and beans
 # --------------------------------------------
diff --git a/resilience4j/service1/src/main/resources/application.properties b/resilience4j/service1/src/main/resources/application.properties
index bf7952fd8..f08995523 100644
--- a/resilience4j/service1/src/main/resources/application.properties
+++ b/resilience4j/service1/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name=Service1
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 server.port=9090
 
 # the port number the service will use for accepting incoming HTTP requests
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties
index 1d3110f30..0fd1cadf5 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-even/src/main/resources/application.properties
@@ -17,6 +17,6 @@
 
 # the name of Camel
 camel.main.name = cxf-otel-even
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 service.random.url = http://localhost:8080
 #logging.level.org.apache.cxf = TRACE
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties
index 4dcefc630..2c4ae1a7a 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-odd/src/main/resources/application.properties
@@ -17,6 +17,6 @@
 
 # the name of Camel
 camel.main.name = cxf-otel-odd
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 service.random.url = http://localhost:8080
 #logging.level.org.apache.cxf = TRACE
diff --git a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties
index f80bb60a9..e15231703 100644
--- a/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties
+++ b/rest-cxf-opentelemetry/rest-cxf-otel-random/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name = cxf-otel-random
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 service.random.url = http://localhost:8080
 service.even.url = http://localhost:8081
 service.odd.url = http://localhost:8082
diff --git a/rest-cxf/src/main/resources/application.properties b/rest-cxf/src/main/resources/application.properties
index 2a01fc692..2c1afff9d 100644
--- a/rest-cxf/src/main/resources/application.properties
+++ b/rest-cxf/src/main/resources/application.properties
@@ -17,5 +17,5 @@
 
 # the name of Camel
 camel.main.name = MyCamel
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 #logging.level.org.apache.cxf = TRACE
diff --git a/route-reload/src/main/resources/application.properties b/route-reload/src/main/resources/application.properties
index cc8bcc068..09547b4bf 100644
--- a/route-reload/src/main/resources/application.properties
+++ b/route-reload/src/main/resources/application.properties
@@ -19,10 +19,10 @@
 camel.main.name = ReloadCamel
 
 # turn on route reloading on file changes
-camel.springboot.routes-reload-enabled = true
+camel.main.routes-reload-enabled = true
 # the base directory to watch
-camel.springboot.routes-reload-directory = src/main/resources/camel
+camel.main.routes-reload-directory = src/main/resources/camel
 # pattern(s) for files to watch
-camel.springboot.routes-reload-pattern = *.xml
+camel.main.routes-reload-pattern = *.xml
 
 
diff --git a/routes-configuration/src/main/resources/application.yaml b/routes-configuration/src/main/resources/application.yaml
index a94a001bc..44d77ae9e 100644
--- a/routes-configuration/src/main/resources/application.yaml
+++ b/routes-configuration/src/main/resources/application.yaml
@@ -20,7 +20,7 @@ camel:
     name: MyCamel
 
     # keep Camel running
-    main-run-controller: true
+    run-controller: true
 
     # verbose summary so you can see the pairing of routes and routes configurations
     startup-summary-level: verbose
diff --git a/saga/saga-app/src/main/resources/application.yml b/saga/saga-app/src/main/resources/application.yml
index 4d63679d3..2bf91fafb 100644
--- a/saga/saga-app/src/main/resources/application.yml
+++ b/saga/saga-app/src/main/resources/application.yml
@@ -40,7 +40,7 @@ camel:
   service:
     lra.enabled: true
   main:
-    main-run-controller: true
+    run-controller: true
     name: Camel-saga
 example.services:
   train: saga-train-service
diff --git a/saga/saga-flight-service/src/main/resources/application.yml b/saga/saga-flight-service/src/main/resources/application.yml
index abf52b0e3..19439e37e 100644
--- a/saga/saga-flight-service/src/main/resources/application.yml
+++ b/saga/saga-flight-service/src/main/resources/application.yml
@@ -40,7 +40,7 @@ camel:
   service:
     lra.enabled: true
   main:
-    main-run-controller: true
+    run-controller: true
     name: Camel-flight
 example.services:
   flight: saga-flight-service
diff --git a/saga/saga-payment-service/src/main/resources/application.yml b/saga/saga-payment-service/src/main/resources/application.yml
index b20302e30..6d46de380 100644
--- a/saga/saga-payment-service/src/main/resources/application.yml
+++ b/saga/saga-payment-service/src/main/resources/application.yml
@@ -40,7 +40,7 @@ camel:
   service:
     lra.enabled: true
   main:
-    main-run-controller: true
+    run-controller: true
     name: Camel-payment
 example.services:
   payment: saga-payment-service
diff --git a/saga/saga-train-service/src/main/resources/application.yml b/saga/saga-train-service/src/main/resources/application.yml
index e4426d1a0..e6e2a3f64 100644
--- a/saga/saga-train-service/src/main/resources/application.yml
+++ b/saga/saga-train-service/src/main/resources/application.yml
@@ -40,7 +40,7 @@ camel:
   service:
     lra.enabled: true
   main:
-    main-run-controller: true
+    run-controller: true
     name: Camel-train
 example.services:
   train: saga-train-service
diff --git a/soap-cxf/src/main/resources/application.properties b/soap-cxf/src/main/resources/application.properties
index c242c9202..65971612e 100644
--- a/soap-cxf/src/main/resources/application.properties
+++ b/soap-cxf/src/main/resources/application.properties
@@ -17,7 +17,7 @@
 
 # the name of Camel
 camel.main.name = MyCamel
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 
 # logging.level.root=TRACE
 
diff --git a/splitter-eip/src/main/resources/application.properties b/splitter-eip/src/main/resources/application.properties
index a924a3d27..7f4c8d0ed 100644
--- a/splitter-eip/src/main/resources/application.properties
+++ b/splitter-eip/src/main/resources/application.properties
@@ -19,7 +19,7 @@
 camel.main.name = CamelSpringBootSplitter
 
 # required for generated Type Converter Loader - Camel 3.x way
-camel.springboot.load-type-converters=true
+camel.main.load-type-converters=true
 
 # to configure logging levels
 logging.level.org.springframework = INFO
diff --git a/spring-jdbc/src/main/resources/application.properties b/spring-jdbc/src/main/resources/application.properties
index 04d296e0c..88eac85ac 100644
--- a/spring-jdbc/src/main/resources/application.properties
+++ b/spring-jdbc/src/main/resources/application.properties
@@ -16,7 +16,7 @@
 ## ---------------------------------------------------------------------------
 
 camel.main.name = MyCamel
-camel.springboot.main-run-controller=true
+camel.main.run-controller=true
 
 camel.servlet.mapping.enabled = true
 camel.servlet.mapping.context-path = /api/*
diff --git a/type-converter/src/main/resources/application.properties b/type-converter/src/main/resources/application.properties
index 81234ad76..3c6642f50 100644
--- a/type-converter/src/main/resources/application.properties
+++ b/type-converter/src/main/resources/application.properties
@@ -2,7 +2,7 @@
 camel.main.name = CamelCustomConverterExample
 
 # required for generated Type Converter Loader - Camel 3.x way
-camel.springboot.load-type-converters=true
+camel.main.load-type-converters=true
 
 # to configure logging levels
 logging.level.org.springframework = INFO
diff --git a/xml/src/main/resources/application.properties b/xml/src/main/resources/application.properties
index 1a340e4a1..cc8eb1ef1 100644
--- a/xml/src/main/resources/application.properties
+++ b/xml/src/main/resources/application.properties
@@ -19,11 +19,11 @@
 camel.main.name = SampleCamel
 
 # to automatic shutdown the JVM after a period of time
-#camel.springboot.duration-max-seconds=60
-#camel.springboot.duration-max-messages=100
+#camel.main.duration-max-seconds=60
+#camel.main.duration-max-messages=100
 
 # add for example: &repeatCount=5 to the timer endpoint to make Camel idle
-#camel.springboot.duration-max-idle-seconds=15
+#camel.main.duration-max-idle-seconds=15
 
 # properties used in the Camel route and beans
 # --------------------------------------------