diff --git a/tool/lib/envutil.rb b/tool/lib/envutil.rb
index 07d76c0e5329b5..0dd86dff5cfa75 100644
--- a/tool/lib/envutil.rb
+++ b/tool/lib/envutil.rb
@@ -244,7 +244,11 @@ def with_default_internal(enc)
 
   def labeled_module(name, &block)
     Module.new do
-      singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s}
+      singleton_class.class_eval {
+        define_method(:to_s) {name}
+        alias inspect to_s
+        alias name to_s
+      }
       class_eval(&block) if block
     end
   end
@@ -252,7 +256,11 @@ def labeled_module(name, &block)
 
   def labeled_class(name, superclass = Object, &block)
     Class.new(superclass) do
-      singleton_class.class_eval {define_method(:to_s) {name}; alias inspect to_s}
+      singleton_class.class_eval {
+        define_method(:to_s) {name}
+        alias inspect to_s
+        alias name to_s
+      }
       class_eval(&block) if block
     end
   end