diff --git a/conf/ueventd.zuma.rc b/conf/ueventd.zuma.rc
index 03c92b1d..f86287f0 100644
--- a/conf/ueventd.zuma.rc
+++ b/conf/ueventd.zuma.rc
@@ -175,7 +175,7 @@
 /dev/block/by-name/mfg_data 0660   system     system
 
 # TPU
-/dev/janeiro            0660   system     system
+/dev/edgetpu-soc            0660   system     system
 
 # DSP
 /dev/gxp                0666   system     camera
diff --git a/edgetpu/OWNERS b/edgetpu/OWNERS
index 9eb92a96..e5718485 100644
--- a/edgetpu/OWNERS
+++ b/edgetpu/OWNERS
@@ -1,6 +1,5 @@
 # Devs who work on EdgeTPU on Android.
 hsuy@google.com
 yuchicheng@google.com
-iayara@google.com
 qinyiyan@google.com
-macwang@google.com
\ No newline at end of file
+macwang@google.com
diff --git a/edgetpu/edgetpu.mk b/edgetpu/edgetpu.mk
index 2ee6edaa..5d53d54d 100644
--- a/edgetpu/edgetpu.mk
+++ b/edgetpu/edgetpu.mk
@@ -1,7 +1,7 @@
 # Edgetpu packages
 
 # Config variables for TPU chip on device.
-$(call soong_config_set,edgetpu_config,chip,janeiro)
+$(call soong_config_set,edgetpu_config,chip,rio)
 
 # TPU logging service
 PRODUCT_PACKAGES += \