diff --git a/lib/msf/base/simple/buffer.rb b/lib/msf/base/simple/buffer.rb
index 08656f654c..5047ba1c49 100644
--- a/lib/msf/base/simple/buffer.rb
+++ b/lib/msf/base/simple/buffer.rb
@@ -25,7 +25,7 @@ module Buffer
       buf = encrypt_buffer(buf, encryption_opts)
     end
 
-    case fmt.downcase
+    case fmt
       when 'raw'
       when 'num'
         buf = Rex::Text.to_num(buf)
@@ -69,7 +69,7 @@ module Buffer
   # raw, ruby, python, perl, bash, js_be, js_le, c, and java.
   #
   def self.comment(buf, fmt = "ruby")
-    case fmt.downcase
+    case fmt
       when 'raw'
       when 'num', 'dword', 'dw', 'hex'
         buf = Rex::Text.to_js_comment(buf)
@@ -138,7 +138,7 @@ module Buffer
   def self.encrypt_buffer(value, encryption_opts)
     buf = ''
 
-    case encryption_opts[:format].downcase
+    case encryption_opts[:format]
     when 'aes256'
       if encryption_opts[:iv].blank?
         raise ArgumentError, 'Initialization vector is missing'
diff --git a/lib/msf/core/payload_generator.rb b/lib/msf/core/payload_generator.rb
index 9367874839..bbda2196c9 100644
--- a/lib/msf/core/payload_generator.rb
+++ b/lib/msf/core/payload_generator.rb
@@ -316,7 +316,7 @@ module Msf
     def generate_java_payload
       payload_module = framework.payloads.create(payload)
       payload_module.datastore.import_options_from_hash(datastore)
-      case format.downcase
+      case format
       when "raw", "jar"
         if payload_module.respond_to? :generate_jar
           payload_module.generate_jar.pack
@@ -373,7 +373,7 @@ module Msf
       elsif gen_payload.length > @space and not @smallest
         raise PayloadSpaceViolation, 'The payload exceeds the specified space'
       else
-        if format.to_s.downcase != 'raw'
+        if format.to_s != 'raw'
           cli_print "Final size of #{format} file: #{gen_payload.length} bytes"
         end
 
diff --git a/msfvenom b/msfvenom
index adf68eff41..a525fb8b27 100755
--- a/msfvenom
+++ b/msfvenom
@@ -90,7 +90,7 @@ def parse_args(args)
   end
 
   opt.on('-f', '--format          <format>', String, "Output format (use --list formats to list)") do |f|
-    opts[:format] = f
+    opts[:format] = f.downcase
   end
 
   opt.on('-e', '--encoder         <encoder>', String, 'The encoder to use (use --list encoders to list)') do |e|