Changed variables to match the configuration.