Fixed imports based on PEP names