Rename configuration variables

makes them a bit clearer