Fixed issue where underscores were not allowed in identifiers