-Fixed define identifiers needing quotes