diff --git a/scripts/manifest_fixer.py b/scripts/manifest_fixer.py
index ebfc4d8..917f55b 100755
--- a/scripts/manifest_fixer.py
+++ b/scripts/manifest_fixer.py
@@ -61,9 +61,10 @@
                       help='specify additional <uses-library> tag to add. android:requred is set to false')
   parser.add_argument('--uses-non-sdk-api', dest='uses_non_sdk_api', action='store_true',
                       help='manifest is for a package built against the platform')
-  parser.add_argument('--prefer-code-integrity', dest='prefer_code_integrity', action='store_true',
-                      help=('specify if the app prefers strict code integrity. Should not be conflict '
-                            'if already declared in the manifest.'))
+  parser.add_argument('--use-embedded-dex', dest='use_embedded_dex', action='store_true',
+                      help=('specify if the app wants to use embedded dex and avoid extracted,'
+                            'locally compiled code. Should not be conflict if already declared '
+                            'in the manifest.'))
   parser.add_argument('input', help='input AndroidManifest.xml file')
   parser.add_argument('output', help='output AndroidManifest.xml file')
   return parser.parse_args()
@@ -272,7 +273,7 @@
     application.setAttributeNode(attr)
 
 
-def add_prefer_code_integrity(doc):
+def add_use_embedded_dex(doc):
   manifest = parse_manifest(doc)
   elems = get_children_with_tag(manifest, 'application')
   application = elems[0] if len(elems) == 1 else None
@@ -285,13 +286,13 @@
     manifest.insertBefore(doc.createTextNode(indent), first)
     manifest.insertBefore(application, first)
 
-  attr = application.getAttributeNodeNS(android_ns, 'preferCodeIntegrity')
+  attr = application.getAttributeNodeNS(android_ns, 'useEmbeddedDex')
   if attr is None:
-    attr = doc.createAttributeNS(android_ns, 'android:preferCodeIntegrity')
+    attr = doc.createAttributeNS(android_ns, 'android:useEmbeddedDex')
     attr.value = 'true'
     application.setAttributeNode(attr)
   elif attr.value != 'true':
-    raise RuntimeError('existing attribute mismatches the option of --prefer-code-integrity')
+    raise RuntimeError('existing attribute mismatches the option of --use-embedded-dex')
 
 
 def write_xml(f, doc):
@@ -321,8 +322,8 @@
     if args.uses_non_sdk_api:
       add_uses_non_sdk_api(doc)
 
-    if args.prefer_code_integrity:
-      add_prefer_code_integrity(doc)
+    if args.use_embedded_dex:
+      add_use_embedded_dex(doc)
 
     with open(args.output, 'wb') as f:
       write_xml(f, doc)
