Update comments with some usage and change the name of the named tuple class
Change the name of named tuple classes
Comment typo