Removed underscore in height field water file name for consistency