more Models->Entities renaming