Renamed environment variables to be compatible with skeleton