Consistency in namedtuple naming
Merge pull request #560 from clouseau/namedtuple

Consistency in namedtuple naming