diff --git a/Android.bp b/Android.bp
index 9266942..6dd555c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,7 +1,7 @@
 java_sdk_library {
-    name: "pawlet-device-system",
-    srcs: ["core/java/pawletos/device/PawletDevice.java"],
-    api_packages: ["pawletos.device"],
+    name: "pawlet-system",
+    srcs: ["core/java/pawletos/device/PawletSystem.java"],
+    api_packages: ["pawletos.device.system"],
     sdk_version: "system_current",
     product_specific: true,
     installable: true,
@@ -16,7 +16,6 @@ java_sdk_library {
 android_library {
     name: "pawlet-device",
     srcs: ["core/java/pawletos/device/PawletDevice.java"],
-    manifest: "AndroidManifest.xml",
     sdk_version: "current",
     static_libs: ["android_stubs_current"],
     product_specific: false,