Added "ent" suffix to communication mapping rule.