Small naming refactor for swimlane data