pep8 fix and update to related name to be more unique.