diff --git a/lib/puppet/parser/ast/collection.rb b/lib/puppet/parser/ast/collection.rb
index 90a914337..ef36b7143 100644
--- a/lib/puppet/parser/ast/collection.rb
+++ b/lib/puppet/parser/ast/collection.rb
@@ -1,47 +1,48 @@
 require 'puppet'
 require 'puppet/parser/ast/branch'
 require 'puppet/parser/collector'
 
 # An object that collects stored objects from the central cache and returns
 # them to the current host, yo.
 class Puppet::Parser::AST
   class Collection < AST::Branch
     attr_accessor :type, :query, :form
     attr_reader :override
 
     associates_doc
 
     # We return an object that does a late-binding evaluation.
     def evaluate(scope)
       str, code = query && query.safeevaluate(scope)
 
-      newcoll = Puppet::Parser::Collector.new(scope, @type, str, code, self.form)
+      resource_type = scope.find_resource_type(@type)
+      newcoll = Puppet::Parser::Collector.new(scope, resource_type.name, str, code, self.form)
 
       scope.compiler.add_collection(newcoll)
 
       # overrides if any
       # Evaluate all of the specified params.
       if @override
         params = @override.collect { |param| param.safeevaluate(scope) }
         newcoll.add_override(
           :parameters => params,
           :file => @file,
           :line => @line,
           :source => scope.source,        
           :scope => scope
         )
       end
 
       newcoll
     end
 
     # Handle our parameter ourselves
     def override=(override)
       @override = if override.is_a?(AST::ASTArray)
         override
       else
         AST::ASTArray.new(:line => override.line,:file => override.file,:children => [override])
       end
     end
   end
 end
diff --git a/spec/unit/parser/ast/collection_spec.rb b/spec/unit/parser/ast/collection_spec.rb
index 3f7878a99..392a2c0f0 100755
--- a/spec/unit/parser/ast/collection_spec.rb
+++ b/spec/unit/parser/ast/collection_spec.rb
@@ -1,63 +1,67 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe Puppet::Parser::AST::Collection do
   before :each do
     @scope = stub_everything 'scope'
+    @mytype = stub_everything('mytype')
+    @scope.stubs(:find_resource_type).returns @mytype
     @compiler = stub_everything 'compile'
     @scope.stubs(:compiler).returns(@compiler)
 
     @overrides = stub_everything 'overrides'
     @overrides.stubs(:is_a?).with(Puppet::Parser::AST).returns(true)
 
   end
 
   it "should evaluate its query" do
     query = mock 'query'
     collection = Puppet::Parser::AST::Collection.new :query => query, :form => :virtual
 
     query.expects(:safeevaluate).with(@scope)
 
     collection.evaluate(@scope)
   end
 
   it "should instantiate a Collector for this type" do
     collection = Puppet::Parser::AST::Collection.new :form => :virtual, :type => "test"
+    @test_type = stub 'type', :name => 'test'
+    @scope.expects(:find_resource_type).with('test').returns @test_type
 
     Puppet::Parser::Collector.expects(:new).with(@scope, "test", nil, nil, :virtual)
 
     collection.evaluate(@scope)
   end
 
   it "should tell the compiler about this collector" do
     collection = Puppet::Parser::AST::Collection.new :form => :virtual, :type => "test"
     Puppet::Parser::Collector.stubs(:new).returns("whatever")
 
     @compiler.expects(:add_collection).with("whatever")
 
     collection.evaluate(@scope)
   end
 
   it "should evaluate overriden paramaters" do
     collector = stub_everything 'collector'
     collection = Puppet::Parser::AST::Collection.new :form => :virtual, :type => "test", :override => @overrides
     Puppet::Parser::Collector.stubs(:new).returns(collector)
 
     @overrides.expects(:safeevaluate).with(@scope)
 
     collection.evaluate(@scope)
   end
 
   it "should tell the collector about overrides" do
     collector = mock 'collector'
     collection = Puppet::Parser::AST::Collection.new :form => :virtual, :type => "test", :override => @overrides
     Puppet::Parser::Collector.stubs(:new).returns(collector)
 
     collector.expects(:add_override)
 
     collection.evaluate(@scope)
   end
 
 
 end