fuk old names
Merge pull request #236 from smogon/3dbd2f5039f4e035df54e82b533d73b9

fuk old names