diff --git a/main-command/src/main/scala/sbt/Highlight.scala b/main-command/src/main/scala/sbt/Highlight.scala
index 3ee8d12ec..811efabfb 100644
--- a/main-command/src/main/scala/sbt/Highlight.scala
+++ b/main-command/src/main/scala/sbt/Highlight.scala
@@ -9,7 +9,7 @@ object Highlight {
 
   def showMatches(pattern: Pattern)(line: String): Option[String] = {
     val matcher = pattern.matcher(line)
-    if (ConsoleAppender.formatEnabled) {
+    if (ConsoleAppender.formatEnabledInEnv) {
       // ANSI codes like \033[39m (normal text color) don't work on Windows
       val highlighted = matcher.replaceAll(scala.Console.RED + "$0" + RESET)
       if (highlighted == line) None else Some(highlighted)
@@ -19,5 +19,5 @@ object Highlight {
       None
   }
   def bold(s: String) =
-    if (ConsoleAppender.formatEnabled) BOLD + s.replace(RESET, RESET + BOLD) + RESET else s
+    if (ConsoleAppender.formatEnabledInEnv) BOLD + s.replace(RESET, RESET + BOLD) + RESET else s
 }
diff --git a/main-settings/src/main/scala/sbt/Def.scala b/main-settings/src/main/scala/sbt/Def.scala
index 68f78d360..6b195ba8d 100644
--- a/main-settings/src/main/scala/sbt/Def.scala
+++ b/main-settings/src/main/scala/sbt/Def.scala
@@ -68,7 +68,7 @@ object Def extends Init[Scope] with TaskMacroExtra {
     Scope.displayMasked(scoped.scope, scoped.key.label, mask)
 
   def withColor(s: String, color: Option[String]): String = {
-    val useColor = ConsoleAppender.formatEnabled
+    val useColor = ConsoleAppender.formatEnabledInEnv
     color match {
       case Some(c) if useColor => c + s + scala.Console.RESET
       case _                   => s
diff --git a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala b/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala
index 69cc100e3..af691f165 100644
--- a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala
+++ b/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala
@@ -145,10 +145,10 @@ object OnlyTaskDynLinterDSL extends BaseTaskLinterDSL {
 }
 
 object TaskLinterDSLFeedback {
-  private final val startBold = if (ConsoleAppender.formatEnabled) AnsiColor.BOLD else ""
-  private final val startRed = if (ConsoleAppender.formatEnabled) AnsiColor.RED else ""
-  private final val startGreen = if (ConsoleAppender.formatEnabled) AnsiColor.GREEN else ""
-  private final val reset = if (ConsoleAppender.formatEnabled) AnsiColor.RESET else ""
+  private final val startBold = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.BOLD else ""
+  private final val startRed = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.RED else ""
+  private final val startGreen = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.GREEN else ""
+  private final val reset = if (ConsoleAppender.formatEnabledInEnv) AnsiColor.RESET else ""
 
   private final val ProblemHeader = s"${startRed}Problem${reset}"
   private final val SolutionHeader = s"${startGreen}Solution${reset}"
diff --git a/main/src/main/scala/sbt/internal/LogManager.scala b/main/src/main/scala/sbt/internal/LogManager.scala
index 16b22b306..5468442ef 100644
--- a/main/src/main/scala/sbt/internal/LogManager.scala
+++ b/main/src/main/scala/sbt/internal/LogManager.scala
@@ -164,10 +164,11 @@ object LogManager {
   ): SuppressedTraceContext => Option[String] = {
     lazy val display = Project.showContextKey(state)
     def commandBase = "last " + display.show(unwrapStreamsKey(key))
-    def command(useColor: Boolean) =
-      if (useColor) BLUE + commandBase + RESET else s"'$commandBase'"
+    def command(useFormat: Boolean) =
+      if (useFormat) BLUE + commandBase + RESET else s"'$commandBase'"
     context =>
-      Some("Stack trace suppressed: run %s for the full output.".format(command(context.useColor)))
+      Some(
+        "Stack trace suppressed: run %s for the full output.".format(command(context.useFormat)))
   }
 
   def unwrapStreamsKey(key: ScopedKey[_]): ScopedKey[_] = key.scope.task match {