[sr-dev] git:master:5664f885: core: use main term for fields and in comments