api changes: make fieldnames more explicit