Some entities renamed