Style Fix: Hyphenated names not underscored