diff --git a/lib/rturk/builders/external_question_builder.rb b/lib/rturk/builders/external_question_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/rturk/builders/external_question_builder.rb
+++ b/lib/rturk/builders/external_question_builder.rb
@@ -48,5 +48,7 @@ module RTurk
 
   end
 
-
+  # TODO: Temporary alias for 2.11.x
+  # Remove in next major version in favor of ExternalQuestion
+  Question = ExternalQuestion
 end
diff --git a/spec/builders/external_question_spec.rb b/spec/builders/external_question_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/builders/external_question_spec.rb
+++ b/spec/builders/external_question_spec.rb
@@ -1,6 +1,13 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 require 'cgi'
 
+# Prevent breaking change from Question to ExternalQuestion
+describe RTurk::Question do
+  it "should alias to ExternalQuestion" do
+    RTurk::Question.should == RTurk::ExternalQuestion
+  end
+end
+
 describe RTurk::ExternalQuestion do
 
   before(:all) do
Alias Question to ExternalQuestion