         BoundedContext = eventric 'BoundedContext'
         exampleApplicationService =
           queries:
-            'Aggregate:findByExample': 'aggregateFindByExample'
-          aggregateFindByExample: sandbox.stub()
+            'customQuery': 'customQueryMethod'
+          customQueryMethod: sandbox.stub()
 
         class ExampleBoundedContext extends BoundedContext
           applicationServices: [
             exampleApplicationService
           ]
+        exampleBoundedContext = new ExampleBoundedContext
+        exampleBoundedContext.initialize()
 
         query =
-          name: 'Aggregate:findByExample'
+          name: 'customQuery'
           params:
             foo: 'bar'
-        exampleBoundedContext = new ExampleBoundedContext
-        exampleBoundedContext.initialize()
         exampleBoundedContext.query query
 
-        expect(exampleApplicationService.aggregateFindByExample.calledWith query.params).to.be.ok()
+        expect(exampleApplicationService.customQueryMethod.calledWith query.params).to.be.ok()
 
 
   describe 'onDomainEvent', ->

      it 'should execute the query directly on the correct read aggregate repository', ->
        BoundedContext = eventric 'BoundedContext'
        class FooReadAggregateRepository
          findByExample: sandbox.stub()
        class ExampleBoundedContext extends BoundedContext
          readAggregateRepositories:
            'Aggregate': FooReadAggregateRepository

        exampleBoundedContext.initialize()

        query =
          name: 'Aggregate:findById'
          id: 42

        exampleBoundedContext.query query

        expect(FooReadAggregateRepository::findById.calledWith query.id).to.be.ok()


    describe 'has a registered handler', ->
