Use feature names with double underscores to avoid macro interference.
Merge branch 'bugfix/guard_feature_names' into develop