diff --git a/bashrc b/bashrc
index ebea79f9..f084e459 100644
--- a/bashrc
+++ b/bashrc
@@ -183,13 +183,13 @@ fi
 # Things after this are just examples and should be put to some other file, which is sourced above.
 
 # Sets the default editor. I am vim user, so I want it to be vim. If you don't like terminal based text editors, change "" to gedit (Gnome) or Kate (KDE).
-#export EDITOR=vim # MIKAELA_GREP MKAYSIGREPENVIRONMENT
+#export EDITOR=vim # MIKAELA_GREP MIKAELA_GREP_ENVIRONMENT
 
 # Sets locale. You can get list of locales with "locale -a" command. This should be something which ends to .utf8
-#export LC_ALL=fi_FI.UTF-8 # MIKAELA_GREP # MKAYSIGREPENVIRONMENT
+#export LC_ALL=fi_FI.UTF-8 # MIKAELA_GREP # MIKAELA_GREP_ENVIRONMENT
 
 # Sets your timezone. Set in format <Region/City>, or just timezone like UTC.
-#export TZ="Europe/Helsinki" # MIKAELA_GREP #MKAYSIGREPENVIRONMENT
+#export TZ="Europe/Helsinki" # MIKAELA_GREP #MIKAELA_GREP_ENVIRONMENT
 
 # pyenv (Source: their README.md file http://git.io/ReCDSQ )
 export PYENV_ROOT="$HOME/.pyenv"
@@ -263,7 +263,7 @@ alias sudo="sudo "
 alias ..="cd .."
 
 # Use htop instead of top, it's better. Requires htop.
-#alias top="htop" # MIKAELA_GREP # MKAYSIGREPALIAS
+#alias top="htop" # MIKAELA_GREP # MIKAELA_GREP_ALIAS
 
 # Add title to youtube-dl & make yle-dl Windows-friendly
 alias youtube-dl="youtube-dl -t"
@@ -271,7 +271,7 @@ alias yle-dl="yle-dl --vfat"
 
 # git specific. This is the command which I use when git asks me to commit something and says that I have modified files, even when I haven't.
 alias gdrop="git stash && git stash drop"
-#alias gitk="gitg" # Requires gitg . I just think that it looks nicer than gitk. #MIKAELA_GREP # MKAYSIGREPALIAS
+#alias gitk="gitg" # Requires gitg . I just think that it looks nicer than gitk. #MIKAELA_GREP # MIKAELA_GREP_ALIAS
 
 # If I run nautilus, I want it to open in folder where I am.
 #alias nautilus="nautilus ./"
diff --git a/gpg.conf b/gpg.conf
index 5d376ed9..f10f1c6b 100644
--- a/gpg.conf
+++ b/gpg.conf
@@ -29,13 +29,13 @@ keyserver-options ca-cert-file=~/.gnupg/sks-keyservers.netCA.pem auto-key-retrie
 auto-key-locate keyserver
 
 # Use my key by default
-#default-key 0x0C207F07B2F32B67 # MIKAELA_GREP # MKAYSIGREPGPG
+#default-key 0x0C207F07B2F32B67 # MIKAELA_GREP # MIKAELA_GREP_GPG
 
 # Encrypt to sender's key by default
 default-recipient-self
 
 # Always encrypt to my key
-#encrypt-to 0x0C207F07B2F32B67# MIKAELA_GREP MKAYSIGREPGPG
+#encrypt-to 0x0C207F07B2F32B67# MIKAELA_GREP MIKAELA_GREP_GPG
 
 # Use UTF-8 charset
 charset UTF-8
@@ -98,7 +98,7 @@ verify-options show-uid-validity
 list-options show-uid-validity
 
 # Add comments to things signed/encrypted by gpg
-#comment Homepage: http://mikaela.info/ # MIKAELA_GREP MKAYSIGREPGPG
-#comment Public key: http://mikaela.info/PGP/0xB2F32B67.txt # MIKAELA_GREP MKAYSIGREPGPG
-#comment gpg --fetch-keys http://mikaela.info/PGP/0xB2F32B67.txt # MIKAELA_GREP MKAYSIGREPGPG
-#comment Fingerprint = 2910 4A46 C561 5BF9 78A0 83F2 0C20 7F07 B2F3 2B67 # MIKAELA_GREP MKAYSIGREPGPG
+#comment Homepage: http://mikaela.info/ # MIKAELA_GREP MIKAELA_GREP_GPG
+#comment Public key: http://mikaela.info/PGP/0xB2F32B67.txt # MIKAELA_GREP MIKAELA_GREP_GPG
+#comment gpg --fetch-keys http://mikaela.info/PGP/0xB2F32B67.txt # MIKAELA_GREP MIKAELA_GREP_GPG
+#comment Fingerprint = 2910 4A46 C561 5BF9 78A0 83F2 0C20 7F07 B2F3 2B67 # MIKAELA_GREP MIKAELA_GREP_GPG
diff --git a/zshrc b/zshrc
index d3e2fc8f..56b37f07 100644
--- a/zshrc
+++ b/zshrc
@@ -122,13 +122,13 @@ export TERM=screen-256color
 fi
 
 # Sets the default editor.
-#export EDITOR=vim # MIKAELA_GREP # MKAYSIGREPENVIRONMENT
+#export EDITOR=vim # MIKAELA_GREP # MIKAELA_GREP_ENVIRONMENT
 
 # Sets locale. You can get list of locales with "locale -a" command. This should be something which ends to .utf8
-#export LC_ALL=fi_FI.UTF-8 # MIKAELA_GREP # MKAYSIGREPENVIRONMENT
+#export LC_ALL=fi_FI.UTF-8 # MIKAELA_GREP # MIKAELA_GREP_ENVIRONMENT
 
 # Sets your timezone. Set in format <Region/City>, or just timezone like UTC.
-# export TZ="Europe/Helsinki" # MIKAELA_GREP # MKAYSIGREPENVIRONMENT
+# export TZ="Europe/Helsinki" # MIKAELA_GREP # MIKAELA_GREP_ENVIRONMENT
 
 # pyenv (Source: their README.md file http://git.io/ReCDSQ )
 export PYENV_ROOT="$HOME/.pyenv"
@@ -200,7 +200,7 @@ alias sudo="sudo "
 alias ..="cd .."
 
 # Use htop instead of top, it's better. Requires htop.
-#alias top="htop" # MIKAELA_GREP MKAYSIGREPALIAS
+#alias top="htop" # MIKAELA_GREP MIKAELA_GREP_ALIAS
 
 # Add title to youtube-dl & make yle-dl Windows-friendly
 alias youtube-dl="youtube-dl -t"
@@ -340,7 +340,7 @@ alias gpg-fix-tty='export GPG_TTY=$(tty)'
 # because that above alias needs this and this will disappear when zsh 
 # gets GPG2 completion. See 
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=666755
-#compdef gpg2=gpg # MIKAELA_GREP MKAYSIGREPALIAS
+#compdef gpg2=gpg # MIKAELA_GREP MIKAELA_GREP_ALIAS
 
 # For locally installed mosh on remote server.
 alias lmosh="mosh --server=~/.local/bin/mosh-server "