=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-22 04:15:41 +0000
+++ CMakeLists.txt	2014-03-27 03:42:25 +0000
@@ -26,9 +26,9 @@
 SET(GETTEXT_PACKAGE unity-scope-selfservice)
 SET(LOCALE_DIR "${CMAKE_INSTALL_DATADIR}/locale")
 
-SET(CUSTOM_INSTALL_LIBDIR /custom/usr/lib/arm-linux-gnueabihf)
+SET(CUSTOM_INSTALL_LIBDIR /custom/lib/arm-linux-gnueabihf)
 SET(CUSTOM_INSTALL_DATADIR /custom/xdg/data/)
-SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity/scopes/scope-selfservice/)
+SET(SCOPE_INSTALL_DIR ${CUSTOM_INSTALL_LIBDIR}/unity-scopes/scope-selfservice/)
 
 CONFIGURE_FILE(
         "${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in"

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-07 22:37:37 +0000
+++ debian/changelog	2014-03-27 03:42:25 +0000
@@ -1,3 +1,9 @@
+unity-scope-selfservice (0.3) trusty; urgency=medium
+
+  * Update for new api
+
+ -- Chris Wayne <chris.wayne@canonical.com>  Wed, 26 Mar 2014 22:25:45 -0400
+
 unity-scope-selfservice (0.2) UNRELEASED; urgency=low
 
   * Reorder scopes to better match JoeO's design 

=== modified file 'src/SelfServiceScope.cpp'
--- src/SelfServiceScope.cpp	2014-02-12 02:12:56 +0000
+++ src/SelfServiceScope.cpp	2014-03-27 03:42:25 +0000
@@ -22,8 +22,7 @@
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/ScopeExceptions.h>
-#include <unity/scopes/Query.h>
-#include <unity/scopes/SearchQuery.h>
+#include <unity/scopes/SearchQueryBase.h>
 #include <unity/UnityExceptions.h>
 
 #include <QDebug>
@@ -38,7 +37,7 @@
 // was passed from upstream. Results from the child scopes are sent to that
 // upstream reply object.
 
-class SelfServiceListener: public SearchListener
+class SelfServiceListener: public SearchListenerBase
 {
 public:
     virtual void push(Category::SCPtr category) override
@@ -82,11 +81,11 @@
     SearchReplyProxy upstream_;
 };
 
-class SelfServiceQuery : public SearchQuery
+class SelfServiceQuery : public SearchQueryBase
 {
 public:
     SelfServiceQuery(string const& scope_name,
-            Query const& query,
+            CannedQuery const& query,
             ScopeProxy const& plan_scope,
             ScopeProxy const& bill_scope,
             ScopeProxy const& bundles_scope,
@@ -107,16 +106,16 @@
 
     virtual void run(SearchReplyProxy const& upstream_reply)
     {
-        SearchListener::SPtr reply(new SelfServiceListener(scope_name_, upstream_reply));
-        create_subquery(plan_scope_, query_.query_string(), reply);
-        create_subquery(bill_scope_, query_.query_string(), reply);
-        create_subquery(bundles_scope_, query_.query_string(), reply);
-        create_subquery(upgrades_scope_, query_.query_string(), reply);
+        SearchListenerBase::SPtr reply(new SelfServiceListener(scope_name_, upstream_reply));
+        subsearch(plan_scope_, query_.query_string(), reply);
+        subsearch(bill_scope_, query_.query_string(), reply);
+        subsearch(bundles_scope_, query_.query_string(), reply);
+        subsearch(upgrades_scope_, query_.query_string(), reply);
     }
 
 private:
     string scope_name_;
-    Query query_;
+    CannedQuery query_;
     ScopeProxy plan_scope_;
     ScopeProxy bill_scope_;
     ScopeProxy bundles_scope_;
@@ -164,16 +163,16 @@
 
     virtual void stop() override {}
 
-    virtual QueryBase::UPtr create_query(unity::scopes::Query const& q, SearchMetadata const&) override
+    virtual SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q, SearchMetadata const&) override
     {
-        QueryBase::UPtr query(new SelfServiceQuery(scope_name_,
+        SearchQueryBase::UPtr query(new SelfServiceQuery(scope_name_,
                     q, plan_scope_, bill_scope_, bundles_scope_,
                     upgrades_scope_));
         qWarning() << "Self Service Scope created query: \"" << q.query_string().c_str() << "\"";
         return query;
     }
 
-    virtual QueryBase::UPtr preview(Result const&, ActionMetadata const&) override
+    virtual PreviewQueryBase::UPtr preview(Result const&, ActionMetadata const&) override
     {
         return nullptr;
     }