changed convetion for namedtuple names