Removed and renamed variables from the main configuration files

Follow up after I02f4750cc37e7b4b928e4f20882382915e465be8

Change-Id: Ia9ba239bbf31a137fbdfcb5d66eeefd9483b0519