fixed ENV names