Revert entity name change

Partially reverts b0f38f4990e46f34f118c19262bcd5f8b9857893
which broke unit tests relying on the old entity name
in 3.1, where translations and the en.yml master file have been backported to.