Refactor pitch class naming.