Fix language selector (rename variables)