renaming: using namedtuples for storage
removing __ from self.__name
changes after code review