diff --git a/client/app.jsx b/client/app.jsx
index f79282d..5ce084f 100644
--- a/client/app.jsx
+++ b/client/app.jsx
@@ -1,7 +1,7 @@
 
 /**
- * Birdseye v.1.0.0
- * ----------------
+ * Alice (formerly known as Birdseye) v.2.0.0
+ * ------------------------------------------
  *
  * @author Matthias Hannig <mha@ecix.net>
  */
diff --git a/client/components/errors/page.jsx b/client/components/errors/page.jsx
index fa0eabf..4f2bf1a 100644
--- a/client/components/errors/page.jsx
+++ b/client/components/errors/page.jsx
@@ -29,7 +29,7 @@ class ErrorsPage extends React.Component {
     if (status == 429) {
       body = (
         <div className="error-message">
-          <p>Birdseye reached the request limit.</p>
+          <p>Alice reached the request limit.</p>
           <p>We suggest you try at a less busy time.</p>
         </div>
       );
@@ -37,7 +37,7 @@ class ErrorsPage extends React.Component {
       body = (
         <div className="error-message">
           <p>
-            Birdseye has trouble connecting to the API
+            Alice has trouble connecting to the API
             {this.props.error.response &&
               " (got HTTP " + this.props.error.response.status + ")"}
             .
diff --git a/client/components/routeservers/actions.jsx b/client/components/routeservers/actions.jsx
index 03df4e4..4bfc770 100644
--- a/client/components/routeservers/actions.jsx
+++ b/client/components/routeservers/actions.jsx
@@ -61,7 +61,7 @@ export function loadRouteservers() {
   return (dispatch) => {
     dispatch(loadRouteserversRequest())
 
-    axios.get('/birdseye/api/routeserver/')
+    axios.get('/api/routeservers')
       .then(({data}) => {
         dispatch(loadRouteserversSuccess(data["routeservers"]));
       })
@@ -106,7 +106,7 @@ export function loadRouteserverStatusError(routeserverId, error) {
 export function loadRouteserverStatus(routeserverId) {
   return (dispatch) => {
     dispatch(loadRouteserverStatusRequest(routeserverId));
-    axios.get(`/birdseye/api/routeserver/${routeserverId}/status/`)
+    axios.get(`/api/routeservers/${routeserverId}/status`)
       .then(({data}) => {
         dispatch(loadRouteserverStatusSuccess(routeserverId, data.status));
       })
@@ -140,10 +140,10 @@ export function loadRouteserverProtocolSuccess(routeserverId, protocol) {
 export function loadRouteserverProtocol(routeserverId) {
   return (dispatch) => {
     dispatch(loadRouteserverProtocolRequest(routeserverId));
-    axios.get(`/birdseye/api/routeserver/${routeserverId}/protocol/`)
+    axios.get(`/api/routeservers/${routeserverId}/neighbours`)
       .then(({data}) => {
         dispatch(setProtocolsFilterValue(""));
-        dispatch(loadRouteserverProtocolSuccess(routeserverId, data.protocols));
+        dispatch(loadRouteserverProtocolSuccess(routeserverId, data.neighbours));
       })
       .catch(error => dispatch(apiError(error)));
   }
@@ -176,10 +176,13 @@ export function loadRouteserverRoutes(routeserverId, protocolId) {
   return (dispatch) => {
     dispatch(loadRouteserverRoutesRequest(routeserverId, protocolId))
 
-    axios.get(`/birdseye/api/routeserver/${routeserverId}/routes/?protocol=${protocolId}`)
+    axios.get(`/api/routeserver/${routeserverId}/neighbours/${protocolId}/routes`)
       .then(({data}) => {
         dispatch(
-          loadRouteserverRoutesSuccess(routeserverId, protocolId, data.routes)
+          loadRouteserverRoutesSuccess(routeserverId, protocolId, data.exported)
+        );
+        dispatch(
+          loadRouteserverRoutesFilteredSuccess(routeserverId, protocolId, data.filtered)
         );
         dispatch(setRoutesFilterValue(""));
       })
@@ -211,6 +214,8 @@ export function loadRouteserverRoutesFilteredSuccess(routeserverId, protocolId,
 
 
 export function loadRouteserverRoutesFiltered(routeserverId, protocolId) {
+  console.log("!!!DEPRECATED!!! loadRouteserverRoutesFiltered")
+  /*
   return (dispatch) => {
     dispatch(loadRouteserverRoutesFilteredRequest(routeserverId, protocolId))
 
@@ -223,6 +228,7 @@ export function loadRouteserverRoutesFiltered(routeserverId, protocolId) {
       })
       .catch(error => dispatch(apiError(error)));
   }
+  */
 }
 
 
diff --git a/client/components/sidebar/header/index.jsx b/client/components/sidebar/header/index.jsx
index b218e18..21652ce 100644
--- a/client/components/sidebar/header/index.jsx
+++ b/client/components/sidebar/header/index.jsx
@@ -12,7 +12,7 @@ export default class SidebarHeader extends React.Component {
           </Link>
         </div>
         <div className="title">
-          <h1>Birdseye</h1>
+          <h1>Alice</h1>
           <p>Your friendly bird looking glass</p>
         </div>
       </div>
diff --git a/client/components/welcome/index.jsx b/client/components/welcome/index.jsx
index 2f66d1f..37b4779 100644
--- a/client/components/welcome/index.jsx
+++ b/client/components/welcome/index.jsx
@@ -12,7 +12,7 @@ export default class Welcome extends React.Component {
        <PageHeader></PageHeader>
 
        <div className="jumbotron">
-         <h1>Welcome to Birdseye!</h1>
+         <h1>Welcome to Alice!</h1>
          <p>Your friendly bird looking glass</p>
        </div>