Removed drums. Will appear in M4. Fixed naming convention for orbs.