pep8, file naming updates