Ongoing Renaming

Improving text around the calculations and renaming files for
consistency.  To Do bring it inline with PEP 8.