renamed configuration variables

So that they are all same