Rename variables for database containers