Compile issues from previous merge with glNext
Renaming EnvironmentEs2 to EnvironmentEs