Fix environment naming