Make Achievement and BattlePet namespaces singular.