Fixed some config var renaming bugs