renamed fields for repurposing (issue 2)
Merge branch 'issue-2' into merged