Did it "properly", accounting for camelCase / hyphenated differences (and updated tests)