Update file names, other PEP 8 updates