renamed items to match changes in Android-Couchbase

Change-Id: If776fb0de25aec141c40acd50f8d08d591cfee8f
Reviewed-on: http://review.couchbase.org/9241
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Reviewed-by: Marty Schoch <marty.schoch@gmail.com>
Tested-by: Dale Harvey <daleharvey@arandomurl.com>
Reviewed-by: Dale Harvey <daleharvey@arandomurl.com>

AndroidManifest.xml

@@ -16,9 +16,8 @@
             </intent-filter>
         </activity>
 
-        <service android:name="com.couchbase.libcouch.CouchService" 
-                 android:enabled="true" 
-                 android:exported="false"></service>
+        <service android:enabled="true" 
+                 android:exported="false" android:name="com.couchbase.android.CouchbaseService"></service>
 
     </application>
 

src/com/couchbase/emptyapp/EmptyAppActivity.java

@@ -5,8 +5,8 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.couchbase.libcouch.CouchbaseMobile;
-import com.couchbase.libcouch.ICouchClient;
+import com.couchbase.android.CouchbaseMobile;
+import com.couchbase.android.ICouchbaseDelegate;
 
 public class EmptyAppActivity extends Activity {
 
@@ -21,13 +21,13 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.main);
 
-		CouchbaseMobile couch = new CouchbaseMobile(getBaseContext(), mCallback);
+		CouchbaseMobile couch = new CouchbaseMobile(getBaseContext(), mDelegate);
 		couchServiceConnection = couch.startCouchbase();
     }
 
-	private final ICouchClient mCallback = new ICouchClient.Stub() {
+	private final ICouchbaseDelegate mDelegate = new ICouchbaseDelegate.Stub() {
 		@Override
-		public void couchStarted(String host, int port) {
+		public void couchbaseStarted(String host, int port) {
 			Log.v(TAG, "Couchbase has started");
 		}