--- a/.bashrc	Tue Dec 17 10:21:15 2013 +0200
+++ b/.bashrc	Mon Dec 23 23:51:52 2013 +0200
@@ -5,8 +5,8 @@
 # XXX
 # [[ -f /etc/bashrc ]] && . /etc/bashrc
 
-if [[ -f ~/.bashenv ]]; then
-  . ~/.bashenv
+if [[ -f ~/.env ]]; then
+  . ~/.env
 fi
 
 PS1='\nbash# '
@@ -173,7 +173,7 @@
 # Load custom settings (user editable).
 # Placed to the end to allow override skel settings.
 
-if [[ -f ~/.bash_custom ]]; then
-  . ~/.bash_custom
+if [[ -f ~/.env.local ]]; then
+  . ~/.env.local
 fi