Updated all entities class names to append Entity