Started working on the "Bricks should respect singular form of nouns"
issue