Merged changes from SjoerdDeVries' bazaar
Renaming to name_underscore variables