Renaming conf vars and globals/parameters to clarify things a bit