That sounds correct. Though I would try to find the name of more local version of those entities if possible.