diff --git a/kythe/docs/schema/example-java.sh b/kythe/docs/schema/example-java.sh
index 301b7c7..a427d85 100755
--- a/kythe/docs/schema/example-java.sh
+++ b/kythe/docs/schema/example-java.sh
@@ -51,7 +51,7 @@
 "$KINDEX_TOOL_BIN" -assemble "${TEST_FILE}".{kindex,Unit,FileData}
 
 # Index the file.
-if ! "$JAVA_INDEXER_BIN" "${TEST_FILE}.kindex" >"${TEST_FILE}.entries"; then
+if ! "$JAVA_INDEXER_BIN" --emit_jvm=NAMES "${TEST_FILE}.kindex" >"${TEST_FILE}.entries"; then
   error INDEX
 fi
 
diff --git a/kythe/java/com/google/devtools/kythe/analyzers/java/JavaIndexerConfig.java b/kythe/java/com/google/devtools/kythe/analyzers/java/JavaIndexerConfig.java
index 6ddac15..c4ad586 100644
--- a/kythe/java/com/google/devtools/kythe/analyzers/java/JavaIndexerConfig.java
+++ b/kythe/java/com/google/devtools/kythe/analyzers/java/JavaIndexerConfig.java
@@ -55,8 +55,9 @@
       names = "--emit_jvm",
       description =
           "Whether to emit name nodes or full JVM language semantic nodes for each Java class(must"
-              + " be either \"names\" or \"semantic\"; \"names\" is the default and deprecated)")
-  private JvmMode jvmMode = JvmMode.NAMES;
+              + " be either \"names\" or \"semantic\"; \"semantic\" is the default and \"names\""
+              + " is deprecated)")
+  private JvmMode jvmMode = JvmMode.SEMANTIC;
 
   @Parameter(
       names = "--emit_anchor_scopes",