start to clean up the plugin vs. goal name handling so the hardcoding can be reduced, and eventually removed