Fixed bugs with Entity naming