diff --git a/private/autoplay_app.te b/private/ephemeral_app.te
similarity index 89%
rename from private/autoplay_app.te
rename to private/ephemeral_app.te
index 2e0ec0e..939737b 100644
--- a/private/autoplay_app.te
+++ b/private/ephemeral_app.te
@@ -2,4 +2,4 @@
 # public, but conceptually should go with this
 # Define and allow access to our own type for ashmem regions.
 # Label ashmem objects with our own unique type.
-tmpfs_domain(autoplay_app)
+tmpfs_domain(ephemeral_app)
diff --git a/private/seapp_contexts b/private/seapp_contexts
index 5d5ad75..6349a97 100644
--- a/private/seapp_contexts
+++ b/private/seapp_contexts
@@ -1,6 +1,6 @@
 # Input selectors:
 #	isSystemServer (boolean)
-#	isAutoPlayApp (boolean)
+#	isEphemeralApp (boolean)
 #	isOwner (boolean)
 #	user (string)
 #	seinfo (string)
@@ -9,7 +9,7 @@
 #	isPrivApp (boolean)
 # isSystemServer=true can only be used once.
 # An unspecified isSystemServer defaults to false.
-# isAutoPlayApp=true will match apps marked by PackageManager as AutoPlay
+# isEphemeralApp=true will match apps marked by PackageManager as Ephemeral
 # isOwner=true will only match for the owner/primary user.
 # isOwner=false will only match for secondary users.
 # If unspecified, the entry can match either case.
@@ -24,7 +24,7 @@
 #
 # Precedence rules:
 # 	  (1) isSystemServer=true before isSystemServer=false.
-# 	  (2) Specified isAutoPlayApp= before unspecified isAutoPlayApp= boolean.
+# 	  (2) Specified isEphemeralApp= before unspecified isEphemeralApp= boolean.
 # 	  (3) Specified isOwner= before unspecified isOwner= boolean.
 #	  (4) Specified user= string before unspecified user= string.
 #	  (5) Fixed user= string before user= prefix (i.e. ending in *).
@@ -82,8 +82,8 @@
 # uid's can be in shell domain
 neverallow user=shell domain=((?!shell).)*
 
-# AutoPlay Apps must run in the autoplay_app domain
-neverallow isAutoPlayApp=true domain=((?!autoplay_app).)*
+# Ephemeral Apps must run in the ephemeral_app domain
+neverallow isEphemeralApp=true domain=((?!ephemeral_app).)*
 
 isSystemServer=true domain=system_server
 user=system seinfo=platform domain=system_app type=system_app_data_file
@@ -94,6 +94,6 @@
 user=shell seinfo=platform domain=shell type=shell_data_file
 user=_isolated domain=isolated_app levelFrom=user
 user=_app seinfo=platform domain=platform_app type=app_data_file levelFrom=user
-user=_app isAutoPlayApp=true domain=autoplay_app type=autoplay_data_file levelFrom=all
+user=_app isEphemeralApp=true domain=ephemeral_app type=ephemeral_data_file levelFrom=all
 user=_app isPrivApp=true domain=priv_app type=app_data_file levelFrom=user
 user=_app domain=untrusted_app type=app_data_file levelFrom=user