enumerator: rename private record
table: add member?
enumerator: use member?