Now using FlatName instead of generic name in entity table