--- a/make/Docs.gmk	Tue Feb 27 20:48:06 2018 +0000
+++ b/make/Docs.gmk	Wed Feb 28 21:21:11 2018 +0000
@@ -44,7 +44,7 @@
 #
 # We will generate API documentation for two different selections of the source
 # code: "Java SE", which contains just the modules covered by the top-level
-# module java.se.ee, and "JDK", which covers all of Java SE and also all
+# module java.se and "JDK", which covers all of Java SE and also all
 # other available modules that should be documented, including imported modules,
 # if any.
 #
@@ -200,7 +200,7 @@
 #
 define setup_gengraph_dot_to_png
   $1_$2_DOT_SRC :=  $$($1_GENGRAPHS_DIR)/$2.dot
-  $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2-graph.png
+  $1_$2_PNG_TARGET := $$($1_TARGET_DIR)/$2/module-graph.png
 
     # For each module needing a graph, create a png file from the dot file
     # generated by the GenGraphs tool and store it in the target dir.
@@ -396,8 +396,8 @@
 
 # Define the groups of the JDK API documentation
 JavaSE_GROUP_NAME := Java SE
-JavaSE_GROUP_MODULES := $(call ColonList, $(sort java.se.ee \
-    $(call FindTransitiveIndirectDepsForModules, java.se.ee)))
+JavaSE_GROUP_MODULES := $(call ColonList, $(sort java.se \
+    $(call FindTransitiveIndirectDepsForModules, java.se)))
 JavaSE_GROUP_DESCRIPTION := \
     The Java Platform, Standard Edition (Java SE) APIs define the core Java \
     platform for general-purpose computing. These APIs are in modules whose \
@@ -445,9 +445,9 @@
 ################################################################################
 # Setup generation of the Java SE API documentation (javadoc + modulegraph)
 
-# The Java SE module scope is just java.se.ee and its transitive indirect
+# The Java SE module scope is just java.se and its transitive indirect
 # exports.
-JAVASE_MODULES := java.se.ee
+JAVASE_MODULES := java.se
 
 $(eval $(call SetupApiDocsGeneration, JAVASE_API, \
     MODULES := $(JAVASE_MODULES), \