Rename internals to use PyExpect