minor modifications

mostly renaming Terrain to TERRAIN