Removed Entity name generators