rename variables and configuration management