Fix environment names