[DEV-2093] Update capitalization and pluralization.