Merge lp:~marcustomlinson/unity-scopes-api/rename_child_scopes_methods into lp:unity-scopes-api

[Marcus Tomlinson]

Rename "child_scopes()" to "find_child_scopes()" and "child_scopes_ordered()" to "child_scopes()" as the ordering constraint may (probably) be (re)moved.

[lp:~marcustomlinson/unity-scopes-api/rename_child_scopes_methods]

324. By Marcus Tomlinson on 2015-03-25

Insert 0replaceme for new symbols

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:324
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/604/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/138
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/130

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/604/rebuild

review: Approve (continuous-integration)

[Michi Henning (michihenning)]

Do we want to target this to unity-scopes-api or to devel?

Also, the change is ABI-incompatible. Just saying'… ;-)

Otherwise, looks fine, seeing that it's just a straight renaming.

review: Approve

[Paweł Stołowski (stolowski)]

Should be targeted at devel. Otherwise looks good.

review: Needs Fixing

[Paweł Stołowski (stolowski)]

Confusion around landing... trunk is OK as we want that in vivid now. +1

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-02-13 09:20:20 +0000
+++ CMakeLists.txt	2015-03-25 07:00:14 +0000
@@ -227,7 +227,7 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 6)
-set(UNITY_SCOPES_MICRO 14)
+set(UNITY_SCOPES_MICRO 15)
 set(UNITY_SCOPES_SOVERSION 3)
 
 # Version for testing, with all symbols visible

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2015-02-13 09:20:20 +0000
+++ RELEASE_NOTES.md	2015-03-25 07:00:14 +0000
@@ -1,6 +1,11 @@
 Release notes
 =============
 
+Changes in version 0.6.15
+=========================
+  - Renamed "child_scopes()" to "find_child_scopes()"
+  - Renamed "child_scopes_ordered()" to "child_scopes()"
+
 Changes in version 0.6.14
 =========================
   - Added push_surfacing_results_from_cache() to Reply proxy. This allows a scope

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-23 14:48:28 +0000
+++ debian/changelog	2015-03-25 07:00:14 +0000
@@ -1,3 +1,10 @@
+unity-scopes-api (0.6.15-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Renamed "child_scopes()" to "find_child_scopes()"
+  * Renamed "child_scopes_ordered()" to "child_scopes()"
+
+ -- Marcus Tomlinson <[e-mail]>  Wed, 25 Mar 2015 08:26:17 +0200
+
 unity-scopes-api (0.6.14+15.04.20150223-0ubuntu1) vivid; urgency=medium
 
   [ Pawel Stolowski ]

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2015-02-13 10:36:25 +0000
+++ debian/libunity-scopes3.symbols	2015-03-25 07:00:14 +0000
@@ -475,7 +475,7 @@
  (c++)"unity::scopes::internal::ScopeConfig::search_hint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::version() const@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::internal::ScopeImpl::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeImpl::child_scopes_ordered()@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::ScopeImpl::child_scopes()@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.6.11+15.04.20150119
  (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0.4.3+14.10.20140428
  (c++)"unity::scopes::internal::ScopeImpl::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
@@ -488,7 +488,7 @@
  (c++)"unity::scopes::internal::ScopeImpl::search(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::FilterState const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::search(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::SearchMetadata const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::search(unity::scopes::CannedQuery const&, unity::scopes::SearchMetadata const&, std::vector<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::tuple<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&, std::shared_ptr<unity::scopes::SearchListenerBase> const&)@Base" 0.6.12+15.04.20150127.2
- (c++)"unity::scopes::internal::ScopeImpl::set_child_scopes_ordered(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::ScopeImpl::set_child_scopes(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeLoader::libpath() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeLoader::load(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.6.0+14.10.20140804.1
  (c++)"unity::scopes::internal::ScopeLoader::scope_base() const@Base" 0.4.0+14.04.20140312.1
@@ -544,7 +544,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_version(int)@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::internal::ScopeMetadataImpl::version() const@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::internal::ScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::ScopeObject::child_scopes_ordered() const@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::ScopeObject::child_scopes() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::ScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
@@ -552,7 +552,7 @@
  (c++)"unity::scopes::internal::ScopeObject::~ScopeObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::ScopeObject(unity::scopes::ScopeBase*, bool)@Base" 0.6.12+15.04.20150127.2
  (c++)"unity::scopes::internal::ScopeObject::search(unity::scopes::CannedQuery const&, unity::scopes::SearchMetadata const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.6.12+15.04.20150127.2
- (c++)"unity::scopes::internal::ScopeObject::set_child_scopes_ordered(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::ScopeObject::set_child_scopes(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSConfig::http_reply_timeout() const@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::smartscopes::SSConfig::reg_refresh_fail_timeout() const@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::smartscopes::SSConfig::reg_refresh_rate() const@Base" 0.4.4+14.10.20140508
@@ -574,13 +574,13 @@
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSRegistryObject(std::shared_ptr<unity::scopes::internal::MiddlewareBase>, unity::scopes::internal::smartscopes::SSConfig const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::smartscopes::SSRegistryObject::SSSettingsDef::~SSSettingsDef()@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
- (c++)"unity::scopes::internal::smartscopes::SSScopeObject::child_scopes_ordered() const@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::smartscopes::SSScopeObject::child_scopes() const@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::preview(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::query(unity::scopes::internal::InvokeInfo const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, std::function<std::shared_ptr<unity::scopes::QueryBase> ()> const&, std::function<void (std::shared_ptr<unity::scopes::QueryBase>)> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::search(unity::scopes::CannedQuery const&, unity::scopes::SearchMetadata const&, std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.6.12+15.04.20150127.2
- (c++)"unity::scopes::internal::smartscopes::SSScopeObject::set_child_scopes_ordered(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::internal::smartscopes::SSScopeObject::set_child_scopes(std::list<unity::scopes::ChildScope, std::allocator<unity::scopes::ChildScope> > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::~SSScopeObject()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::smartscopes::SSScopeObject::SSScopeObject(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MiddlewareBase>, std::shared_ptr<unity::scopes::internal::smartscopes::SSRegistryObject>)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::StateReceiverObject::push_state(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, unity::scopes::internal::StateReceiverObject::State const&)@Base" 0.4.2+14.04.20140404.2
@@ -780,8 +780,8 @@
  (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::app_directory() const@Base" 0.6.9+15.04.20141129
  (c++)"unity::scopes::ScopeBase::cache_directory() const@Base" 0.6.0+14.10.20140804.1
- (c++)"unity::scopes::ScopeBase::child_scopes() const@Base" 0.6.12+15.04.20150127.2
- (c++)"unity::scopes::ScopeBase::child_scopes_ordered() const@Base" 0.6.12+15.04.20150127.2
+ (c++)"unity::scopes::ScopeBase::child_scopes() const@Base" 0replaceme
+ (c++)"unity::scopes::ScopeBase::find_child_scopes() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeBase::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::registry() const@Base" 0.6.0+14.10.20140804.1
  (c++)"unity::scopes::ScopeBase::run()@Base" 0.4.0+14.04.20140312.1

=== modified file 'include/unity/scopes/AbstractScopeBase.h'
--- include/unity/scopes/AbstractScopeBase.h	2015-01-26 08:10:59 +0000
+++ include/unity/scopes/AbstractScopeBase.h	2015-03-25 07:00:14 +0000
@@ -59,8 +59,8 @@
 
     virtual ~AbstractScopeBase();
 
+    virtual ChildScopeList find_child_scopes() const = 0;
     virtual ChildScopeList child_scopes() const = 0;
-    virtual ChildScopeList child_scopes_ordered() const = 0;
 
 protected:
     AbstractScopeBase();

=== modified file 'include/unity/scopes/Scope.h'
--- include/unity/scopes/Scope.h	2015-01-15 04:56:00 +0000
+++ include/unity/scopes/Scope.h	2015-03-25 07:00:14 +0000
@@ -142,19 +142,19 @@
     virtual ~Scope();
 
     /**
-    \brief Returns a list of child scopes aggregated by this scope in user-defined order.
-    \return The list of child scopes aggregated by this scope in user-defined order.
+    \brief Returns a list of child scopes aggregated by this scope.
+    \return The list of child scopes aggregated by this scope.
     */
-    virtual ChildScopeList child_scopes_ordered() = 0;
+    virtual ChildScopeList child_scopes() = 0;
 
     /**
-    \brief Sets the ordered list of child scopes aggregated by this scope.
+    \brief Sets the list of child scopes aggregated by this scope.
     \note The only time this call will return false is if the scope cannot write to its config directory.
     This should not happen in real-world usage, but if it does, check the log for more detail.
-    \param child_scopes_ordered The ordered list of child scopes aggregated by this scope.
+    \param child_scopes The list of child scopes aggregated by this scope.
     \return True if the list was successfully set.
     */
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) = 0;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) = 0;
 
 protected:
     /// @cond

=== modified file 'include/unity/scopes/ScopeBase.h'
--- include/unity/scopes/ScopeBase.h	2015-01-26 08:10:59 +0000
+++ include/unity/scopes/ScopeBase.h	2015-03-25 07:00:14 +0000
@@ -331,31 +331,32 @@
     virtual VariantMap settings() const final;
 
     /**
-    \brief Returns a list of child scopes aggregated by this scope.
+    \brief Returns a defaulted list of child scopes aggregated by this scope.
 
     The scope author must ensure that the list returned by this method contains all scopes
-    that this aggregator may collect results from. This list may contain scopes that are
-    not currently installed and are optional for proper functioning of this scope.
+    that this aggregator may collect results from. The "enabled" state for each child
+    returned should be set to a default value (i.e. whether the child is enabled or
+    disabled by default when newly discovered).
 
     The default behaviour of this method is to simply return all available scopes on the
-    system. This translates to: "Any scope may potentially be aggregated by this scope".
+    system in disabled state. This translates to: "Any scope may potentially be aggregated
+    by this scope".
 
     \note Only aggregator scopes should implement this method.
 
     \return The list of child scopes aggregated by this scope.
     */
-    virtual ChildScopeList child_scopes() const;
+    virtual ChildScopeList find_child_scopes() const;
 
     /**
-    \brief Returns a list of child scopes aggregated by this scope in user-defined order.
-
-    An aggregator scope must push its results in the order specified by this method's
-    return value. The aggregator should also respect the "enabled" states of each child
-    scope, returning results only for the child scopes that are enabled.
-
-    \return The list of child scopes aggregated by this scope in user-defined order.
+    \brief Returns the current list of child scopes aggregated by this scope.
+
+    An aggregator should respect the "enabled" states of each child scope, returning
+    results only for the child scopes that are enabled.
+
+    \return The list of child scopes aggregated by this scope.
     */
-    virtual ChildScopeList child_scopes_ordered() const final;
+    virtual ChildScopeList child_scopes() const final;
 
 protected:
     /// @cond

=== modified file 'include/unity/scopes/internal/ChildScopesRepository.h'
--- include/unity/scopes/internal/ChildScopesRepository.h	2014-12-18 06:03:42 +0000
+++ include/unity/scopes/internal/ChildScopesRepository.h	2015-03-25 07:00:14 +0000
@@ -43,8 +43,8 @@
     ChildScopesRepository(std::string const& repo_file_path,
                           boost::log::sources::severity_channel_logger_mt<>& logger);
 
-    ChildScopeList child_scopes_ordered(ChildScopeList const& child_scopes_unordered);
-    bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered);
+    ChildScopeList child_scopes(ChildScopeList const& child_scopes_unordered);
+    bool set_child_scopes(ChildScopeList const& child_scopes);
 
 private:
     bool write_repo(ChildScopeList const& child_scopes_list);

=== modified file 'include/unity/scopes/internal/MWScope.h'
--- include/unity/scopes/internal/MWScope.h	2015-01-26 08:20:45 +0000
+++ include/unity/scopes/internal/MWScope.h	2015-03-25 07:00:14 +0000
@@ -59,8 +59,8 @@
                                    VariantMap const& hints,
                                    MWReplyProxy const& reply) = 0;
 
-    virtual ChildScopeList child_scopes_ordered() = 0;
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) = 0;
+    virtual ChildScopeList child_scopes() = 0;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) = 0;
 
     virtual bool debug_mode() = 0;
 

=== modified file 'include/unity/scopes/internal/ScopeBaseImpl.h'
--- include/unity/scopes/internal/ScopeBaseImpl.h	2014-12-18 05:37:39 +0000
+++ include/unity/scopes/internal/ScopeBaseImpl.h	2015-03-25 07:00:14 +0000
@@ -64,9 +64,9 @@
 
     void set_child_scopes_repo(std::shared_ptr<ChildScopesRepository> const& child_scopes_repo);
 
-    ChildScopeList child_scopes() const;
-    ChildScopeList child_scopes_ordered(ChildScopeList const& unordered_child_scopes) const;
-    bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered);
+    ChildScopeList find_child_scopes() const;
+    ChildScopeList child_scopes(ChildScopeList const& unordered_child_scopes) const;
+    bool set_child_scopes(ChildScopeList const& child_scopes);
 
 private:
     std::string scope_directory_;

=== modified file 'include/unity/scopes/internal/ScopeImpl.h'
--- include/unity/scopes/internal/ScopeImpl.h	2015-01-26 08:20:45 +0000
+++ include/unity/scopes/internal/ScopeImpl.h	2015-03-25 07:00:14 +0000
@@ -92,8 +92,8 @@
                                    ActionMetadata const& hints,
                                    PreviewListenerBase::SPtr const& reply) override;
 
-    virtual ChildScopeList child_scopes_ordered() override;
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) override;
+    virtual ChildScopeList child_scopes() override;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) override;
 
     static ScopeProxy create(MWScopeProxy const& mw_proxy, std::string const& scope_id);
 

=== modified file 'include/unity/scopes/internal/ScopeObject.h'
--- include/unity/scopes/internal/ScopeObject.h	2015-02-03 04:40:54 +0000
+++ include/unity/scopes/internal/ScopeObject.h	2015-03-25 07:00:14 +0000
@@ -77,8 +77,8 @@
                                      MWReplyProxy const& reply,
                                      InvokeInfo const& info) override;
 
-    virtual ChildScopeList child_scopes_ordered() const override;
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) override;
+    virtual ChildScopeList child_scopes() const override;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) override;
 
     virtual bool debug_mode() const override;
 

=== modified file 'include/unity/scopes/internal/ScopeObjectBase.h'
--- include/unity/scopes/internal/ScopeObjectBase.h	2015-01-27 09:38:24 +0000
+++ include/unity/scopes/internal/ScopeObjectBase.h	2015-03-25 07:00:14 +0000
@@ -69,8 +69,8 @@
                                      MWReplyProxy const& reply,
                                      InvokeInfo const& info) = 0;
 
-    virtual ChildScopeList child_scopes_ordered() const = 0;
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) = 0;
+    virtual ChildScopeList child_scopes() const = 0;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) = 0;
 
     virtual bool debug_mode() const = 0;
 };

=== modified file 'include/unity/scopes/internal/smartscopes/SSScopeObject.h'
--- include/unity/scopes/internal/smartscopes/SSScopeObject.h	2015-01-26 08:20:45 +0000
+++ include/unity/scopes/internal/smartscopes/SSScopeObject.h	2015-03-25 07:00:14 +0000
@@ -74,8 +74,8 @@
                              MWReplyProxy const& reply,
                              InvokeInfo const& info) override;
 
-    ChildScopeList child_scopes_ordered() const override;
-    bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) override;
+    ChildScopeList child_scopes() const override;
+    bool set_child_scopes(ChildScopeList const& child_scopes) override;
 
     bool debug_mode() const override;
 

=== modified file 'include/unity/scopes/internal/zmq_middleware/ScopeI.h'
--- include/unity/scopes/internal/zmq_middleware/ScopeI.h	2014-12-09 03:59:22 +0000
+++ include/unity/scopes/internal/zmq_middleware/ScopeI.h	2015-03-25 07:00:14 +0000
@@ -53,10 +53,10 @@
     virtual void preview_(Current const& current,
                           capnp::AnyPointer::Reader& in_params,
                           capnproto::Response::Builder& r);
-    virtual void child_scopes_ordered_(Current const& current,
+    virtual void child_scopes_(Current const& current,
                           capnp::AnyPointer::Reader& in_params,
                           capnproto::Response::Builder& r);
-    virtual void set_child_scopes_ordered_(Current const& current,
+    virtual void set_child_scopes_(Current const& current,
                           capnp::AnyPointer::Reader& in_params,
                           capnproto::Response::Builder& r);
     virtual void debug_mode_(Current const& current,

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqScope.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2015-01-26 08:20:45 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2015-03-25 07:00:14 +0000
@@ -63,8 +63,8 @@
                                    VariantMap const& hints,
                                    MWReplyProxy const& reply) override;
 
-    virtual ChildScopeList child_scopes_ordered() override;
-    virtual bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered) override;
+    virtual ChildScopeList child_scopes() override;
+    virtual bool set_child_scopes(ChildScopeList const& child_scopes) override;
 
     virtual bool debug_mode() override;
 

=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2014-12-17 08:08:25 +0000
+++ include/unity/scopes/testing/MockScope.h	2015-03-25 07:00:14 +0000
@@ -64,9 +64,9 @@
                                          ActionMetadata const&,
                                          PreviewListenerBase::SPtr const&));
 
-    MOCK_METHOD0(child_scopes_ordered, ChildScopeList());
+    MOCK_METHOD0(child_scopes, ChildScopeList());
 
-    MOCK_METHOD1(set_child_scopes_ordered, bool(ChildScopeList const&));
+    MOCK_METHOD1(set_child_scopes, bool(ChildScopeList const&));
 };
 
 /// @endcond

=== modified file 'src/scopes/ScopeBase.cpp'
--- src/scopes/ScopeBase.cpp	2014-12-09 07:15:24 +0000
+++ src/scopes/ScopeBase.cpp	2015-03-25 07:00:14 +0000
@@ -102,14 +102,14 @@
     return p->settings();
 }
 
+ChildScopeList ScopeBase::find_child_scopes() const
+{
+    return p->find_child_scopes();
+}
+
 ChildScopeList ScopeBase::child_scopes() const
 {
-    return p->child_scopes();
-}
-
-ChildScopeList ScopeBase::child_scopes_ordered() const
-{
-    return p->child_scopes_ordered(child_scopes());
+    return p->child_scopes(find_child_scopes());
 }
 
 } // namespace scopes

=== modified file 'src/scopes/internal/ChildScopesRepository.cpp'
--- src/scopes/internal/ChildScopesRepository.cpp	2014-12-18 06:03:42 +0000
+++ src/scopes/internal/ChildScopesRepository.cpp	2015-03-25 07:00:14 +0000
@@ -34,7 +34,7 @@
 {
 }
 
-ChildScopeList ChildScopesRepository::child_scopes_ordered(ChildScopeList const& child_scopes_unordered)
+ChildScopeList ChildScopesRepository::child_scopes(ChildScopeList const& child_scopes_unordered)
 {
     std::lock_guard<std::mutex> lock(mutex_);
 
@@ -117,11 +117,11 @@
     return new_child_scopes_ordered;
 }
 
-bool ChildScopesRepository::set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered)
+bool ChildScopesRepository::set_child_scopes(ChildScopeList const& child_scopes)
 {
     // simply write child_scopes_ordered to file
     std::lock_guard<std::mutex> lock(mutex_);
-    return write_repo(child_scopes_ordered);
+    return write_repo(child_scopes);
 }
 
 bool ChildScopesRepository::write_repo(ChildScopeList const& child_scopes_list)

=== modified file 'src/scopes/internal/ScopeBaseImpl.cpp'
--- src/scopes/internal/ScopeBaseImpl.cpp	2015-01-26 08:10:59 +0000
+++ src/scopes/internal/ScopeBaseImpl.cpp	2015-03-25 07:00:14 +0000
@@ -181,7 +181,7 @@
     child_scopes_repo_initialized_ = true;
 }
 
-ChildScopeList ScopeBaseImpl::child_scopes() const
+ChildScopeList ScopeBaseImpl::find_child_scopes() const
 {
     // Get a copy of the registry proxy
     RegistryProxy reg = registry();
@@ -201,24 +201,24 @@
     return return_list;
 }
 
-ChildScopeList ScopeBaseImpl::child_scopes_ordered(ChildScopeList const& child_scopes_unordered) const
+ChildScopeList ScopeBaseImpl::child_scopes(ChildScopeList const& child_scopes_unordered) const
 {
     lock_guard<mutex> lock(mutex_);
     if (!child_scopes_repo_initialized_)
     {
-        throw LogicException("ScopeBase::child_scopes_ordered() cannot be called from constructor");
+        throw LogicException("ScopeBase::child_scopes() cannot be called from constructor");
     }
-    return child_scopes_repo_ ? child_scopes_repo_->child_scopes_ordered(child_scopes_unordered) : ChildScopeList();
+    return child_scopes_repo_ ? child_scopes_repo_->child_scopes(child_scopes_unordered) : ChildScopeList();
 }
 
-bool ScopeBaseImpl::set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered)
+bool ScopeBaseImpl::set_child_scopes(ChildScopeList const& child_scopes)
 {
     lock_guard<mutex> lock(mutex_);
     if (!child_scopes_repo_initialized_)
     {
-        throw LogicException("ScopeBase::set_child_scopes_ordered() cannot be called from constructor");
+        throw LogicException("ScopeBase::set_child_scopes() cannot be called from constructor");
     }
-    return child_scopes_repo_ ? child_scopes_repo_->set_child_scopes_ordered(child_scopes_ordered) : false;
+    return child_scopes_repo_ ? child_scopes_repo_->set_child_scopes(child_scopes) : false;
 }
 
 } // namespace internal

=== modified file 'src/scopes/internal/ScopeImpl.cpp'
--- src/scopes/internal/ScopeImpl.cpp	2015-01-26 08:20:45 +0000
+++ src/scopes/internal/ScopeImpl.cpp	2015-03-25 07:00:14 +0000
@@ -319,14 +319,14 @@
     return ctrl;
 }
 
-ChildScopeList ScopeImpl::child_scopes_ordered()
+ChildScopeList ScopeImpl::child_scopes()
 {
-    return fwd()->child_scopes_ordered();
+    return fwd()->child_scopes();
 }
 
-bool ScopeImpl::set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered)
+bool ScopeImpl::set_child_scopes(ChildScopeList const& child_scopes)
 {
-    return fwd()->set_child_scopes_ordered(child_scopes_ordered);
+    return fwd()->set_child_scopes(child_scopes);
 }
 
 ScopeProxy ScopeImpl::create(MWScopeProxy const& mw_proxy, std::string const& scope_id)

=== modified file 'src/scopes/internal/ScopeObject.cpp'
--- src/scopes/internal/ScopeObject.cpp	2015-02-03 04:47:35 +0000
+++ src/scopes/internal/ScopeObject.cpp	2015-03-25 07:00:14 +0000
@@ -257,14 +257,14 @@
     );
 }
 
-ChildScopeList ScopeObject::child_scopes_ordered() const
+ChildScopeList ScopeObject::child_scopes() const
 {
-    return scope_base_->child_scopes_ordered();
+    return scope_base_->child_scopes();
 }
 
-bool ScopeObject::set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered)
+bool ScopeObject::set_child_scopes(ChildScopeList const& child_scopes)
 {
-    return scope_base_->p->set_child_scopes_ordered(child_scopes_ordered);
+    return scope_base_->p->set_child_scopes(child_scopes);
 }
 
 bool ScopeObject::debug_mode() const

=== modified file 'src/scopes/internal/smartscopes/SSScopeObject.cpp'
--- src/scopes/internal/smartscopes/SSScopeObject.cpp	2015-01-26 08:20:45 +0000
+++ src/scopes/internal/smartscopes/SSScopeObject.cpp	2015-03-25 07:00:14 +0000
@@ -192,12 +192,12 @@
     return info.mw->create_query_ctrl_proxy(reply->identity() + ".c", info.mw->get_query_ctrl_endpoint());
 }
 
-ChildScopeList SSScopeObject::child_scopes_ordered() const
+ChildScopeList SSScopeObject::child_scopes() const
 {
     return ChildScopeList();
 }
 
-bool SSScopeObject::set_child_scopes_ordered(ChildScopeList const&)
+bool SSScopeObject::set_child_scopes(ChildScopeList const&)
 {
     return false;
 }

=== modified file 'src/scopes/internal/zmq_middleware/ScopeI.cpp'
--- src/scopes/internal/zmq_middleware/ScopeI.cpp	2015-01-26 08:20:45 +0000
+++ src/scopes/internal/zmq_middleware/ScopeI.cpp	2015-03-25 07:00:14 +0000
@@ -60,8 +60,8 @@
     QueryCtrl* preview(ValueDict result, ValueDict hints, Reply* replyProxy);
     QueryCtrl* perform_action(ValueDict result, ValueDict hints, string action_id, Reply* replyProxy);
     QueryCtrl* activate(ValueDict result, ValueDict hints, Reply* replyProxy);
-    ChildScopeList child_scopes_ordered();
-    bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered);
+    ChildScopeList child_scopes();
+    bool set_child_scopes(ChildScopeList const& child_scopes);
     bool debug_mode();
 };
 
@@ -75,8 +75,8 @@
                       { "preview", bind(&ScopeI::preview_, this, ph::_1, ph::_2, ph::_3) },
                       { "activate", bind(&ScopeI::activate_, this, ph::_1, ph::_2, ph::_3) },
                       { "perform_action", bind(&ScopeI::perform_action_, this, ph::_1, ph::_2, ph::_3) },
-                      { "child_scopes_ordered", bind(&ScopeI::child_scopes_ordered_, this, ph::_1, ph::_2, ph::_3) },
-                      { "set_child_scopes_ordered", bind(&ScopeI::set_child_scopes_ordered_, this, ph::_1, ph::_2, ph::_3) },
+                      { "child_scopes", bind(&ScopeI::child_scopes_, this, ph::_1, ph::_2, ph::_3) },
+                      { "set_child_scopes", bind(&ScopeI::set_child_scopes_, this, ph::_1, ph::_2, ph::_3) },
                       { "debug_mode", bind(&ScopeI::debug_mode_, this, ph::_1, ph::_2, ph::_3) }
     })
 {
@@ -200,21 +200,21 @@
     p.setCategory(ctrl_proxy->target_category().c_str());
 }
 
-void ScopeI::child_scopes_ordered_(Current const&,
+void ScopeI::child_scopes_(Current const&,
                       capnp::AnyPointer::Reader&,
                       capnproto::Response::Builder& r)
 {
     auto delegate = dynamic_pointer_cast<ScopeObjectBase>(del());
     assert(delegate);
 
-    auto child_scopes_ordered = delegate->child_scopes_ordered();
+    auto child_scopes = delegate->child_scopes();
 
     r.setStatus(capnproto::ResponseStatus::SUCCESS);
-    auto list_response = r.initPayload().getAs<capnproto::Scope::ChildScopesOrderedResponse>();
-    auto list = list_response.initReturnValue(child_scopes_ordered.size());
+    auto list_response = r.initPayload().getAs<capnproto::Scope::ChildScopesResponse>();
+    auto list = list_response.initReturnValue(child_scopes.size());
 
     int i = 0;
-    for (auto const& child_scope : child_scopes_ordered)
+    for (auto const& child_scope : child_scopes)
     {
         list[i].setId(child_scope.id);
         list[i].setEnabled(child_scope.enabled);
@@ -222,14 +222,14 @@
     }
 }
 
-void ScopeI::set_child_scopes_ordered_(Current const&,
+void ScopeI::set_child_scopes_(Current const&,
                       capnp::AnyPointer::Reader& in_params,
                       capnproto::Response::Builder& r)
 {
     auto delegate = std::dynamic_pointer_cast<ScopeObjectBase>(del());
     assert(delegate);
 
-    auto list = in_params.getAs<capnproto::Scope::SetChildScopesOrderedRequest>().getChildScopesOrdered();
+    auto list = in_params.getAs<capnproto::Scope::SetChildScopesRequest>().getChildScopes();
 
     ChildScopeList child_scope_list;
     for (size_t i = 0; i < list.size(); ++i)
@@ -239,9 +239,9 @@
         child_scope_list.push_back( ChildScope{id, enabled} );
     }
 
-    bool result = delegate->set_child_scopes_ordered(child_scope_list);
+    bool result = delegate->set_child_scopes(child_scope_list);
     r.setStatus(capnproto::ResponseStatus::SUCCESS);
-    auto response = r.initPayload().getAs<capnproto::Scope::SetChildScopesOrderedResponse>();
+    auto response = r.initPayload().getAs<capnproto::Scope::SetChildScopesResponse>();
     response.setReturnValue(result);
 }
 

=== modified file 'src/scopes/internal/zmq_middleware/ZmqScope.cpp'
--- src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-01-26 08:20:45 +0000
+++ src/scopes/internal/zmq_middleware/ZmqScope.cpp	2015-03-25 07:00:14 +0000
@@ -56,8 +56,8 @@
     QueryCtrl* activate(string query, ValueDict hints, Reply* replyProxy);
     QueryCtrl* perform_action(string query, ValueDict hints, string action_id, Reply* replyProxy);
     QueryCtrl* preview(string query, ValueDict hints, Reply* replyProxy);
-    ChildScopeList child_scopes_ordered();
-    bool set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered);
+    ChildScopeList child_scopes();
+    bool set_child_scopes(ChildScopeList const& child_scopes);
     bool debug_mode();
 };
 
@@ -207,10 +207,10 @@
     return make_shared<QueryCtrlImpl>(p, reply_proxy);
 }
 
-ChildScopeList ZmqScope::child_scopes_ordered()
+ChildScopeList ZmqScope::child_scopes()
 {
     capnp::MallocMessageBuilder request_builder;
-    make_request_(request_builder, "child_scopes_ordered");
+    make_request_(request_builder, "child_scopes");
 
     auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_scope_(request_builder); });
 
@@ -218,7 +218,7 @@
     auto response = out_params.reader->getRoot<capnproto::Response>();
     throw_if_runtime_exception(response);
 
-    auto list = response.getPayload().getAs<capnproto::Scope::ChildScopesOrderedResponse>().getReturnValue();
+    auto list = response.getPayload().getAs<capnproto::Scope::ChildScopesResponse>().getReturnValue();
 
     ChildScopeList child_scope_list;
     for (size_t i = 0; i < list.size(); ++i)
@@ -230,16 +230,16 @@
     return child_scope_list;
 }
 
-bool ZmqScope::set_child_scopes_ordered(ChildScopeList const& child_scopes_ordered)
+bool ZmqScope::set_child_scopes(ChildScopeList const& child_scopes)
 {
     capnp::MallocMessageBuilder request_builder;
-    auto request = make_request_(request_builder, "set_child_scopes_ordered");
+    auto request = make_request_(request_builder, "set_child_scopes");
 
-    auto in_params = request.initInParams().getAs<capnproto::Scope::SetChildScopesOrderedRequest>();
-    auto list = in_params.initChildScopesOrdered(child_scopes_ordered.size());
+    auto in_params = request.initInParams().getAs<capnproto::Scope::SetChildScopesRequest>();
+    auto list = in_params.initChildScopes(child_scopes.size());
 
     int i = 0;
-    for (auto const& child_scope : child_scopes_ordered)
+    for (auto const& child_scope : child_scopes)
     {
         list[i].setId(child_scope.id);
         list[i].setEnabled(child_scope.enabled);
@@ -251,7 +251,7 @@
     auto r = out_params.reader->getRoot<capnproto::Response>();
     throw_if_runtime_exception(r);
 
-    auto response = r.getPayload().getAs<capnproto::Scope::SetChildScopesOrderedResponse>();
+    auto response = r.getPayload().getAs<capnproto::Scope::SetChildScopesResponse>();
     return response.getReturnValue();
 }
 

=== modified file 'src/scopes/internal/zmq_middleware/capnproto/Scope.capnp'
--- src/scopes/internal/zmq_middleware/capnproto/Scope.capnp	2015-01-26 08:20:45 +0000
+++ src/scopes/internal/zmq_middleware/capnproto/Scope.capnp	2015-03-25 07:00:14 +0000
@@ -72,17 +72,17 @@
     enabled @1 : Bool;
 }
 
-struct ChildScopesOrderedResponse
+struct ChildScopesResponse
 {
     returnValue @0 : List(ChildScope);
 }
 
-struct SetChildScopesOrderedRequest
+struct SetChildScopesRequest
 {
-    childScopesOrdered @0 : List(ChildScope);
+    childScopes @0 : List(ChildScope);
 }
 
-struct SetChildScopesOrderedResponse
+struct SetChildScopesResponse
 {
     returnValue @0 : Bool;
 }

=== modified file 'test/gtest/scopes/ChildScopes/ChildScopes_test.cpp'
--- test/gtest/scopes/ChildScopes/ChildScopes_test.cpp	2015-02-17 00:27:08 +0000
+++ test/gtest/scopes/ChildScopes/ChildScopes_test.cpp	2015-03-25 07:00:14 +0000
@@ -142,9 +142,9 @@
     // Start TestScope
     start_test_scope();
 
-    // 1st TestScope::child_scopes() returns: "A,B,C"
+    // 1st TestScope::find_child_scopes() returns: "A,B,C"
     // No order has been set yet, so we should just get: "A,B,C"
-    ChildScopeList return_list = test_scope->child_scopes_ordered();
+    ChildScopeList return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeA", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -160,11 +160,11 @@
     list.push_back({"ScopeB", false});
     list.push_back({"ScopeE", false});
     list.push_back({"ScopeA", true});
-    EXPECT_TRUE(test_scope->set_child_scopes_ordered(list));
+    EXPECT_TRUE(test_scope->set_child_scopes(list));
 
-    // 2nd TestScope::child_scopes() returns: "D,A,B,C,E"
+    // 2nd TestScope::find_child_scopes() returns: "D,A,B,C,E"
     // with order: "B,E,A", we should get: "B,E,A,D,C"
-    return_list = test_scope->child_scopes_ordered();
+    return_list = test_scope->child_scopes();
     EXPECT_EQ(5, return_list.size());
     EXPECT_EQ("ScopeB", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -181,9 +181,9 @@
     EXPECT_EQ("ScopeC", return_list.front().id);
     EXPECT_TRUE(return_list.front().enabled);
 
-    // 3rd+ TestScope::child_scopes() returns: "D,A,B"
+    // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
     // with order: "B,E,A,D,C", we should get: "B,A,D"
-    return_list = test_scope->child_scopes_ordered();
+    return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeB", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -200,12 +200,12 @@
     list.push_back({"ScopeD", true});
     list.push_back({"ScopeX", true});
     list.push_back({"ScopeA", false});
-    EXPECT_TRUE(test_scope->set_child_scopes_ordered(list));
+    EXPECT_TRUE(test_scope->set_child_scopes(list));
 
-    // 3rd+ TestScope::child_scopes() returns: "D,A,B"
+    // 3rd+ TestScope::find_child_scopes() returns: "D,A,B"
     // with order: "B,D,X,A", we should get: "B,D,A"
-    return_list = test_scope->child_scopes_ordered();
-    return_list = test_scope->child_scopes_ordered();
+    return_list = test_scope->child_scopes();
+    return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeB", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -223,9 +223,9 @@
     // Start TestScope
     start_test_scope();
 
-    // 1st TestScope::child_scopes() returns: "A,B,C"
+    // 1st TestScope::find_child_scopes() returns: "A,B,C"
     // with order: "B,D,A" (from previous test), we should get: "B,A,C"
-    ChildScopeList return_list = test_scope->child_scopes_ordered();
+    ChildScopeList return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeB", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -250,11 +250,11 @@
     list.push_back({"ScopeB", false});
     list.push_back({"ScopeA", false});
     list.push_back({"ScopeC", true});
-    EXPECT_FALSE(test_scope->set_child_scopes_ordered(list));
+    EXPECT_FALSE(test_scope->set_child_scopes(list));
 
-    // 1st TestScope::child_scopes() returns: "A,B,C"
+    // 1st TestScope::find_child_scopes() returns: "A,B,C"
     // No order was set, so we should just get: "A,B,C"
-    ChildScopeList return_list = test_scope->child_scopes_ordered();
+    ChildScopeList return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeA", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -276,9 +276,9 @@
     write_partially_corrupt_config();
     start_test_scope();
 
-    // 1st TestScope::child_scopes() returns: "A,B,C"
+    // 1st TestScope::find_child_scopes() returns: "A,B,C"
     // with partial order: "B", we should get: "B,A,C"
-    ChildScopeList return_list = test_scope->child_scopes_ordered();
+    ChildScopeList return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeB", return_list.front().id);
     EXPECT_TRUE(return_list.front().enabled);
@@ -295,7 +295,7 @@
     start_test_scope();
 
     // Check that nothing crashes and we simply get the list from the scope as is
-    return_list = test_scope->child_scopes_ordered();
+    return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeA", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);
@@ -312,7 +312,7 @@
     start_test_scope();
 
     // Check that nothing crashes and we simply get the list from the scope as is
-    return_list = test_scope->child_scopes_ordered();
+    return_list = test_scope->child_scopes();
     EXPECT_EQ(3, return_list.size());
     EXPECT_EQ("ScopeA", return_list.front().id);
     EXPECT_FALSE(return_list.front().enabled);

=== modified file 'test/gtest/scopes/ChildScopes/TestScope.h'
--- test/gtest/scopes/ChildScopes/TestScope.h	2014-12-17 08:08:25 +0000
+++ test/gtest/scopes/ChildScopes/TestScope.h	2015-03-25 07:00:14 +0000
@@ -39,9 +39,9 @@
         return nullptr;
     }
 
-    ChildScopeList child_scopes() const override
+    ChildScopeList find_child_scopes() const override
     {
-        // 1st TestScope::child_scopes() returns: "A,B,C"
+        // 1st TestScope::find_child_scopes() returns: "A,B,C"
         if (i == 0)
         {
             ChildScopeList list;
@@ -51,7 +51,7 @@
             ++i;
             return list;
         }
-        // 2nd TestScope::child_scopes() returns: "D,A,B,C,E"
+        // 2nd TestScope::find_child_scopes() returns: "D,A,B,C,E"
         else if (i == 1)
         {
             ChildScopeList list;
@@ -63,7 +63,7 @@
             ++i;
             return list;
         }
-        // 3rd+ TestScope::child_scopes() returns: D,A,B
+        // 3rd+ TestScope::find_child_scopes() returns: D,A,B
         else
         {
             ChildScopeList list;

=== modified file 'test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp'
--- test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2014-12-17 08:08:25 +0000
+++ test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp	2015-03-25 07:00:14 +0000
@@ -92,9 +92,9 @@
                     ActionMetadata const&,
                     PreviewListenerBase::SPtr const&));
 
-    MOCK_METHOD0(child_scopes_ordered, ChildScopeList());
+    MOCK_METHOD0(child_scopes, ChildScopeList());
 
-    MOCK_METHOD1(set_child_scopes_ordered, bool(ChildScopeList const&));
+    MOCK_METHOD1(set_child_scopes, bool(ChildScopeList const&));
 };
 
 

=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-02-09 02:23:22 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-03-25 07:00:14 +0000
@@ -454,12 +454,12 @@
         return nullptr;
     }
 
-    virtual ChildScopeList child_scopes_ordered() const override
+    virtual ChildScopeList child_scopes() const override
     {
         return ChildScopeList();
     }
 
-    virtual bool set_child_scopes_ordered(ChildScopeList const&) override
+    virtual bool set_child_scopes(ChildScopeList const&) override
     {
         return false;
     }