More renaming in _entities generation module