Hyphens are no longer valid in variable names, fixes #44