Allow dashes in custom fields used for calculations

[#1]

Currently, if a custom field has a dash " - " in the name, then it cannot be used to create a calculated field. This has negatively impacted the naming convention we use to keep custom fields organized/legible.

I would like to be able to keep using a dash in the custom field names without affecting our ability to use it for custom calculations.