Small naming change after merge