Issue #2365737: Auto-created goals don't have the correct machine name format