56 files changed, 3 insertions, 3 deletions
diff --git a/actionservice/ChangeLog b/actionwebservice/ChangeLog
index 010c4f638a..010c4f638a 100644
--- a/actionservice/ChangeLog
+++ b/actionwebservice/ChangeLog
diff --git a/actionservice/HACKING b/actionwebservice/HACKING
index 9c0cde6313..9c0cde6313 100644
--- a/actionservice/HACKING
+++ b/actionwebservice/HACKING
diff --git a/actionservice/MIT-LICENSE b/actionwebservice/MIT-LICENSE
index 528941e849..528941e849 100644
--- a/actionservice/MIT-LICENSE
+++ b/actionwebservice/MIT-LICENSE
diff --git a/actionservice/README b/actionwebservice/README
index c011b9c537..c011b9c537 100644
--- a/actionservice/README
+++ b/actionwebservice/README
diff --git a/actionservice/Rakefile b/actionwebservice/Rakefile
index f4ed2bdb31..f4ed2bdb31 100644
--- a/actionservice/Rakefile
+++ b/actionwebservice/Rakefile
diff --git a/actionservice/TODO b/actionwebservice/TODO
index 4ee7545de5..4ee7545de5 100644
--- a/actionservice/TODO
+++ b/actionwebservice/TODO
diff --git a/actionservice/examples/googlesearch/README b/actionwebservice/examples/googlesearch/README
index 25ccbd2382..25ccbd2382 100644
--- a/actionservice/examples/googlesearch/README
+++ b/actionwebservice/examples/googlesearch/README
diff --git a/actionservice/examples/googlesearch/autoloading/google_search_api.rb b/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb
index e7e33a1105..e7e33a1105 100644
--- a/actionservice/examples/googlesearch/autoloading/google_search_api.rb
+++ b/actionwebservice/examples/googlesearch/autoloading/google_search_api.rb
diff --git a/actionservice/examples/googlesearch/autoloading/google_search_controller.rb b/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb
index c62e869df5..c62e869df5 100644
--- a/actionservice/examples/googlesearch/autoloading/google_search_controller.rb
+++ b/actionwebservice/examples/googlesearch/autoloading/google_search_controller.rb
diff --git a/actionservice/examples/googlesearch/delegated/google_search_service.rb b/actionwebservice/examples/googlesearch/delegated/google_search_service.rb
index da7f8f4529..da7f8f4529 100644
--- a/actionservice/examples/googlesearch/delegated/google_search_service.rb
+++ b/actionwebservice/examples/googlesearch/delegated/google_search_service.rb
diff --git a/actionservice/examples/googlesearch/delegated/search_controller.rb b/actionwebservice/examples/googlesearch/delegated/search_controller.rb
index 6525921b5a..6525921b5a 100644
--- a/actionservice/examples/googlesearch/delegated/search_controller.rb
+++ b/actionwebservice/examples/googlesearch/delegated/search_controller.rb
diff --git a/actionservice/examples/googlesearch/direct/google_search_api.rb b/actionwebservice/examples/googlesearch/direct/google_search_api.rb
index e7e33a1105..e7e33a1105 100644
--- a/actionservice/examples/googlesearch/direct/google_search_api.rb
+++ b/actionwebservice/examples/googlesearch/direct/google_search_api.rb
diff --git a/actionservice/examples/googlesearch/direct/search_controller.rb b/actionwebservice/examples/googlesearch/direct/search_controller.rb
index 7c69f0225e..7c69f0225e 100644
--- a/actionservice/examples/googlesearch/direct/search_controller.rb
+++ b/actionwebservice/examples/googlesearch/direct/search_controller.rb
diff --git a/actionservice/examples/metaWeblog/README b/actionwebservice/examples/metaWeblog/README
index f8a56d7018..f8a56d7018 100644
--- a/actionservice/examples/metaWeblog/README
+++ b/actionwebservice/examples/metaWeblog/README
diff --git a/actionservice/examples/metaWeblog/blog_controller.rb b/actionwebservice/examples/metaWeblog/blog_controller.rb
index aff2e909ea..aff2e909ea 100644
--- a/actionservice/examples/metaWeblog/blog_controller.rb
+++ b/actionwebservice/examples/metaWeblog/blog_controller.rb
diff --git a/actionservice/lib/action_service.rb b/actionwebservice/lib/action_service.rb
index 005e829e7b..005e829e7b 100644
--- a/actionservice/lib/action_service.rb
+++ b/actionwebservice/lib/action_service.rb
diff --git a/actionservice/lib/action_service/api.rb b/actionwebservice/lib/action_service/api.rb
index 61f36fff56..61f36fff56 100644
--- a/actionservice/lib/action_service/api.rb
+++ b/actionwebservice/lib/action_service/api.rb
diff --git a/actionservice/lib/action_service/api/abstract.rb b/actionwebservice/lib/action_service/api/abstract.rb
index aab37a285d..aab37a285d 100644
--- a/actionservice/lib/action_service/api/abstract.rb
+++ b/actionwebservice/lib/action_service/api/abstract.rb
diff --git a/actionservice/lib/action_service/api/action_controller.rb b/actionwebservice/lib/action_service/api/action_controller.rb
index d603f3a570..d603f3a570 100644
--- a/actionservice/lib/action_service/api/action_controller.rb
+++ b/actionwebservice/lib/action_service/api/action_controller.rb
diff --git a/actionservice/lib/action_service/base.rb b/actionwebservice/lib/action_service/base.rb
index 05fd2afd34..05fd2afd34 100644
--- a/actionservice/lib/action_service/base.rb
+++ b/actionwebservice/lib/action_service/base.rb
diff --git a/actionservice/lib/action_service/client.rb b/actionwebservice/lib/action_service/client.rb
index ce91529f20..ce91529f20 100644
--- a/actionservice/lib/action_service/client.rb
+++ b/actionwebservice/lib/action_service/client.rb
diff --git a/actionservice/lib/action_service/client/base.rb b/actionwebservice/lib/action_service/client/base.rb
index 955887a4d8..955887a4d8 100644
--- a/actionservice/lib/action_service/client/base.rb
+++ b/actionwebservice/lib/action_service/client/base.rb
diff --git a/actionservice/lib/action_service/client/soap.rb b/actionwebservice/lib/action_service/client/soap.rb
index c617f36589..c617f36589 100644
--- a/actionservice/lib/action_service/client/soap.rb
+++ b/actionwebservice/lib/action_service/client/soap.rb
diff --git a/actionservice/lib/action_service/client/xmlrpc.rb b/actionwebservice/lib/action_service/client/xmlrpc.rb
index d0d007f871..d0d007f871 100644
--- a/actionservice/lib/action_service/client/xmlrpc.rb
+++ b/actionwebservice/lib/action_service/client/xmlrpc.rb
diff --git a/actionservice/lib/action_service/container.rb b/actionwebservice/lib/action_service/container.rb
index 282e6ad928..282e6ad928 100644
--- a/actionservice/lib/action_service/container.rb
+++ b/actionwebservice/lib/action_service/container.rb
diff --git a/actionservice/lib/action_service/invocation.rb b/actionwebservice/lib/action_service/invocation.rb
index f35ab76386..f35ab76386 100644
--- a/actionservice/lib/action_service/invocation.rb
+++ b/actionwebservice/lib/action_service/invocation.rb
diff --git a/actionservice/lib/action_service/protocol.rb b/actionwebservice/lib/action_service/protocol.rb
index 5e71b2bcfd..5e71b2bcfd 100644
--- a/actionservice/lib/action_service/protocol.rb
+++ b/actionwebservice/lib/action_service/protocol.rb
diff --git a/actionservice/lib/action_service/protocol/abstract.rb b/actionwebservice/lib/action_service/protocol/abstract.rb
index bd02b6e829..bd02b6e829 100644
--- a/actionservice/lib/action_service/protocol/abstract.rb
+++ b/actionwebservice/lib/action_service/protocol/abstract.rb
diff --git a/actionservice/lib/action_service/protocol/registry.rb b/actionwebservice/lib/action_service/protocol/registry.rb
index e06361f916..e06361f916 100644
--- a/actionservice/lib/action_service/protocol/registry.rb
+++ b/actionwebservice/lib/action_service/protocol/registry.rb
diff --git a/actionservice/lib/action_service/protocol/soap.rb b/actionwebservice/lib/action_service/protocol/soap.rb
index 993e174e52..993e174e52 100644
--- a/actionservice/lib/action_service/protocol/soap.rb
+++ b/actionwebservice/lib/action_service/protocol/soap.rb
diff --git a/actionservice/lib/action_service/protocol/xmlrpc.rb b/actionwebservice/lib/action_service/protocol/xmlrpc.rb
index 32b8e00327..32b8e00327 100644
--- a/actionservice/lib/action_service/protocol/xmlrpc.rb
+++ b/actionwebservice/lib/action_service/protocol/xmlrpc.rb
diff --git a/actionservice/lib/action_service/router.rb b/actionwebservice/lib/action_service/router.rb
index 16f0ae4463..16f0ae4463 100644
--- a/actionservice/lib/action_service/router.rb
+++ b/actionwebservice/lib/action_service/router.rb
diff --git a/actionservice/lib/action_service/router/action_controller.rb b/actionwebservice/lib/action_service/router/action_controller.rb
index ca9c94e35c..ca9c94e35c 100644
--- a/actionservice/lib/action_service/router/action_controller.rb
+++ b/actionwebservice/lib/action_service/router/action_controller.rb
diff --git a/actionservice/lib/action_service/router/wsdl.rb b/actionwebservice/lib/action_service/router/wsdl.rb
index c2f29da0b0..c2f29da0b0 100644
--- a/actionservice/lib/action_service/router/wsdl.rb
+++ b/actionwebservice/lib/action_service/router/wsdl.rb
diff --git a/actionservice/lib/action_service/struct.rb b/actionwebservice/lib/action_service/struct.rb
index 142127b052..142127b052 100644
--- a/actionservice/lib/action_service/struct.rb
+++ b/actionwebservice/lib/action_service/struct.rb
diff --git a/actionservice/lib/action_service/support/class_inheritable_options.rb b/actionwebservice/lib/action_service/support/class_inheritable_options.rb
index 4d1c2ed471..4d1c2ed471 100644
--- a/actionservice/lib/action_service/support/class_inheritable_options.rb
+++ b/actionwebservice/lib/action_service/support/class_inheritable_options.rb
diff --git a/actionservice/lib/action_service/support/signature.rb b/actionwebservice/lib/action_service/support/signature.rb
index 946118c523..946118c523 100644
--- a/actionservice/lib/action_service/support/signature.rb
+++ b/actionwebservice/lib/action_service/support/signature.rb
diff --git a/actionservice/setup.rb b/actionwebservice/setup.rb
index 0807023db2..0807023db2 100644
--- a/actionservice/setup.rb
+++ b/actionwebservice/setup.rb
diff --git a/actionservice/test/abstract_client.rb b/actionwebservice/test/abstract_client.rb
index 70d2d21124..70d2d21124 100644
--- a/actionservice/test/abstract_client.rb
+++ b/actionwebservice/test/abstract_client.rb
diff --git a/actionservice/test/abstract_soap.rb b/actionwebservice/test/abstract_soap.rb
index 7454be9bdf..7454be9bdf 100644
--- a/actionservice/test/abstract_soap.rb
+++ b/actionwebservice/test/abstract_soap.rb
diff --git a/actionservice/test/abstract_unit.rb b/actionwebservice/test/abstract_unit.rb
index 54ca73b35c..54ca73b35c 100644
--- a/actionservice/test/abstract_unit.rb
+++ b/actionwebservice/test/abstract_unit.rb
diff --git a/actionservice/test/api_test.rb b/actionwebservice/test/api_test.rb
index 2ef5cc7bda..2ef5cc7bda 100644
--- a/actionservice/test/api_test.rb
+++ b/actionwebservice/test/api_test.rb
diff --git a/actionservice/test/base_test.rb b/actionwebservice/test/base_test.rb
index a9fbdd1a8b..a9fbdd1a8b 100644
--- a/actionservice/test/base_test.rb
+++ b/actionwebservice/test/base_test.rb
diff --git a/actionservice/test/client_soap_test.rb b/actionwebservice/test/client_soap_test.rb
index 80fae90543..80fae90543 100644
--- a/actionservice/test/client_soap_test.rb
+++ b/actionwebservice/test/client_soap_test.rb
diff --git a/actionservice/test/client_xmlrpc_test.rb b/actionwebservice/test/client_xmlrpc_test.rb
index 35768adf32..35768adf32 100644
--- a/actionservice/test/client_xmlrpc_test.rb
+++ b/actionwebservice/test/client_xmlrpc_test.rb
diff --git a/actionservice/test/container_test.rb b/actionwebservice/test/container_test.rb
index 8c66651b64..8c66651b64 100644
--- a/actionservice/test/container_test.rb
+++ b/actionwebservice/test/container_test.rb
diff --git a/actionservice/test/invocation_test.rb b/actionwebservice/test/invocation_test.rb
index e4c82a35f8..e4c82a35f8 100644
--- a/actionservice/test/invocation_test.rb
+++ b/actionwebservice/test/invocation_test.rb
diff --git a/actionservice/test/protocol_registry_test.rb b/actionwebservice/test/protocol_registry_test.rb
index 8e2b9659a6..8e2b9659a6 100644
--- a/actionservice/test/protocol_registry_test.rb
+++ b/actionwebservice/test/protocol_registry_test.rb
diff --git a/actionservice/test/protocol_soap_test.rb b/actionwebservice/test/protocol_soap_test.rb
index 164d06bbd6..164d06bbd6 100644
--- a/actionservice/test/protocol_soap_test.rb
+++ b/actionwebservice/test/protocol_soap_test.rb
diff --git a/actionservice/test/protocol_xmlrpc_test.rb b/actionwebservice/test/protocol_xmlrpc_test.rb
index a8a6efc07e..a8a6efc07e 100644
--- a/actionservice/test/protocol_xmlrpc_test.rb
+++ b/actionwebservice/test/protocol_xmlrpc_test.rb
diff --git a/actionservice/test/router_action_controller_test.rb b/actionwebservice/test/router_action_controller_test.rb
index e26d67c194..e26d67c194 100644
--- a/actionservice/test/router_action_controller_test.rb
+++ b/actionwebservice/test/router_action_controller_test.rb
diff --git a/actionservice/test/router_wsdl_test.rb b/actionwebservice/test/router_wsdl_test.rb
index 6812d25579..6812d25579 100644
--- a/actionservice/test/router_wsdl_test.rb
+++ b/actionwebservice/test/router_wsdl_test.rb
diff --git a/actionservice/test/struct_test.rb b/actionwebservice/test/struct_test.rb
index b883c6d991..b883c6d991 100644
--- a/actionservice/test/struct_test.rb
+++ b/actionwebservice/test/struct_test.rb
diff --git a/railties/Rakefile b/railties/Rakefile
index f64f15b149..9bfe811b8e 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -246,7 +246,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 1.6.0')
   s.add_dependency('actionpack', '>= 1.4.0')
   s.add_dependency('actionmailer', '>= 0.6.1')
-  s.add_dependency('actionservice', '>= 0.4.0')
+  s.add_dependency('actionwebservice', '>= 0.4.0')
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 3638f6f1fc..b5340bd7c9 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -24,7 +24,7 @@ ADDITIONAL_LOAD_PATHS.concat %w(
   vendor/activerecord/lib
   vendor/actionpack/lib
   vendor/actionmailer/lib
-  vendor/actionservice/lib
+  vendor/actionwebservice/lib
 ).map { |dir| "#{RAILS_ROOT}/#{dir}" }
 
 # Prepend to $LOAD_PATH
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index dd2c7c2d29..dc424aa6b3 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -30,7 +30,7 @@ require_gem 'activesupport'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
-require_gem 'actionservice'
+require_gem 'actionwebservice'
 require_gem 'rails'