updates for more CC-translatable wording
update to support easier transition to newer schema