upgrade the stupid configuration variables naming scheme