diff --git a/lib/grep.sh b/lib/grep.sh
index 282051e..5c2d1e9 100644
--- a/lib/grep.sh
+++ b/lib/grep.sh
@@ -26,4 +26,4 @@ alias grep="grep $GREP_OPTIONS"
 # clean up
 unset GREP_OPTIONS
 unset VCS_FOLDERS
-unset -f grep-flag-available
+unset -f grep_flag_available
diff --git a/lib/misc.sh b/lib/misc.sh
index 735d2ac..ca7dc6a 100644
--- a/lib/misc.sh
+++ b/lib/misc.sh
@@ -23,4 +23,4 @@ if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then
 fi
 
 # recognize comments
-shopt interactivecomments
+shopt interactive_comments