EntityGenerator2 class name changed to ClassGenerator