Rename fields, fixes #125 registry lookup issues