diff --git a/password.html b/password.html
index ff53d36e..4073f104 100644
--- a/password.html
+++ b/password.html
@@ -169,7 +169,7 @@
           <input type="checkbox" id="include-lowercase-chars-checkbox" checked> Lower-case
         </label>
         <label>
-          <input type="checkbox" id="include-digits-checkbox" checked> Digits
+          <input type="checkbox" id="include-numbers-checkbox" checked> Numbers
         </label>
         <label>
           <input type="checkbox" id="include-special-chars-checkbox"> Special
@@ -204,7 +204,7 @@
         var uppercase = "ABCDEFGHIJKLMNOPQRSTUVWXTZ";
         var lowercase = "abcdefghiklmnopqrstuvwxyz";
         var numbers = "0123456789";
-        var punct = ".,-/#!$%^&*;:{}=-_`~()]";
+        var special = ".,-/#!$%^&*;:{}=-_`~()]";
         var candidates = '';
         if (options.includeUppercaseChars) {
           candidates += uppercase;
@@ -215,8 +215,8 @@
         if (options.includeNumbers) {
           candidates += numbers;
         }
-        if (options.includePunctuationChars) {
-          candidates += punct;
+        if (options.includeSpecialChars) {
+          candidates += special;
         }
         var password = "";
         for (var i = 0; i < options.passwordLength; i++) {
@@ -236,8 +236,8 @@
           passwordLength: $("#password-length").val(),
           includeUppercaseChars: $("#include-uppercase-chars-checkbox").is(":checked"),
           includeLowercaseChars: $("#include-lowercase-chars-checkbox").is(":checked"),
-          includeNumbers: $("#include-digits-checkbox").is(":checked"),
-          includePunctuationChars: $("#include-special-chars-checkbox").is(":checked"),
+          includeNumbers: $("#include-numbers-checkbox").is(":checked"),
+          includeSpecialChars: $("#include-special-chars-checkbox").is(":checked"),
         }
       };
       function outputGeneratedPassword() {