Revert "* renamed ammoDef() to getAmmoDef() and def() to getDef()"

This reverts commit a40bf4c59a4085b120eb935eeba7ff6f29486192.