Changed naming convention to match Team-0x0A standards