diff --git a/grails-app/init/grails/plugins/rabbitmq/Application.groovy b/grails-app/init/grails/plugins/rabbitmq/Application.groovy
index 5203407..f7eaddb 100644
--- a/grails-app/init/grails/plugins/rabbitmq/Application.groovy
+++ b/grails-app/init/grails/plugins/rabbitmq/Application.groovy
@@ -2,10 +2,7 @@ package grails.plugins.rabbitmq
 
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration
-import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration
 
-@EnableAutoConfiguration(exclude = [RabbitAutoConfiguration])
 class Application extends GrailsAutoConfiguration {
     static void main(String[] args) {
         GrailsApp.run(Application, args)
diff --git a/src/main/groovy/grails.plugins.rabbitmq/RabbitServiceConfigurer.groovy b/src/main/groovy/grails.plugins.rabbitmq/RabbitServiceConfigurer.groovy
index 1f40467..af44415 100644
--- a/src/main/groovy/grails.plugins.rabbitmq/RabbitServiceConfigurer.groovy
+++ b/src/main/groovy/grails.plugins.rabbitmq/RabbitServiceConfigurer.groovy
@@ -201,7 +201,7 @@ class RabbitServiceConfigurer {
             // ready to process messages.
             autoStartup = false
             channelTransacted = isServiceTransactional()
-            connectionFactory = ref("rabbitMQConnectionFactory")
+            connectionFactory = ref("rabbitConnectionFactory")
             concurrentConsumers = serviceConcurrentConsumers
             messageListener = ref("${propertyName}RabbitAdapter")
             for (entry in containerOptions) {
diff --git a/src/main/groovy/grails.plugins.rabbitmq/RabbitmqGrailsPlugin.groovy b/src/main/groovy/grails.plugins.rabbitmq/RabbitmqGrailsPlugin.groovy
index a968187..778102a 100644
--- a/src/main/groovy/grails.plugins.rabbitmq/RabbitmqGrailsPlugin.groovy
+++ b/src/main/groovy/grails.plugins.rabbitmq/RabbitmqGrailsPlugin.groovy
@@ -85,7 +85,7 @@ class RabbitmqGrailsPlugin extends Plugin {
             def parentClassLoader = getClass().classLoader
             def loader = new GroovyClassLoader(parentClassLoader)
             def connectionFactoryClass = loader.loadClass(connectionFactoryClassName)
-            rabbitMQConnectionFactory(connectionFactoryClass, connectionFactoryHostname) {
+            rabbitConnectionFactory(connectionFactoryClass, connectionFactoryHostname) {
                 username = connectionFactoryUsername
                 password = connectionFactoryPassword
                 channelCacheSize = connectionChannelCacheSize
@@ -99,7 +99,7 @@ class RabbitmqGrailsPlugin extends Plugin {
                 }
             }
             rabbitTemplate(RabbitTemplate) {
-                connectionFactory = rabbitMQConnectionFactory
+                connectionFactory = rabbitConnectionFactory
                 if (messageConverterBean) {
                      messageConverter = ref(messageConverterBean)
                  } else {
@@ -108,7 +108,7 @@ class RabbitmqGrailsPlugin extends Plugin {
                      messageConverter = converter
                  }
             }
-            adm(RabbitAdmin, rabbitMQConnectionFactory)
+            adm(RabbitAdmin, rabbitConnectionFactory)
             rabbitErrorHandler(RabbitErrorHandler)
 
             // Add beans to hook up services as AMQP listeners.
@@ -212,7 +212,7 @@ class RabbitmqGrailsPlugin extends Plugin {
     }
 
     private addDynamicMessageSendingMethods(classes, ctx) {
-        if(ctx.rabbitMQConnectionFactory) {
+        if(ctx.rabbitConnectionFactory) {
             classes.each { clz ->
                 RabbitDynamicMethods.applyAllMethods(clz, ctx)
             }