[2.0] Renaming orm:generate-entity-stubs to orm:generate-entities to be consistent and fixed a few bugs