Allowing dashes in code names. Closes #1166