renamed to prevent confusion
Merge pull request #588 from smogon/b9f6c178313f2a1d7714395e433eea0f

renamed to prevent confusion