What about making that dash vs. underscore in ids consistent? Not sure of all potential side effects though :/