Changed case to match PEP standard
More chaning of files to match PEP standards