Entity naming now optional, as intended