fixes #729 - use generic names for table entity and selection field