[511782] Adjust grammar/models for consistent Collection bounds 
5 files changed