Cleanup ultra

this pull requests gets rid of subtle differences in naming conventions across pool and record types.