Updates graph/map labels

Updates graph/map labels for consistency with naming convention being
used in Outputs Explanation (#249).  Also fixes #262.