diff --git a/goss-checkmd5pwhash.rb b/goss-checkmd5pwhash.rb
index 5810917..49598b6 100644
--- a/goss-checkmd5pwhash.rb
+++ b/goss-checkmd5pwhash.rb
@@ -6,7 +6,7 @@ require File.expand_path("../../../../config/environment", __FILE__)
 def query_md5_password_custom_field(username)
   user = User.find_by(username: username)
   if user
-    md5_password = user.custom_fields['custom_password_md5']
+    md5_password = user.custom_fields['md5_password']
     if md5_password
       puts "MD5 password custom field for user #{username}: #{md5_password}"
     else
diff --git a/goss-setmd5pwhash.rb b/goss-setmd5pwhash.rb
index e4494a1..ab2b5ea 100644
--- a/goss-setmd5pwhash.rb
+++ b/goss-setmd5pwhash.rb
@@ -6,7 +6,7 @@ require File.expand_path("../../../../config/environment", __FILE__)
 def set_md5_password_custom_field(username, md5_password)
   user = User.find_by(username: username)
   if user
-    user.custom_fields['custom_password_md5'] = md5_password
+    user.custom_fields['md5_password'] = md5_password
     user.save!
     puts "MD5 password custom field set for user: #{username}"
   else