remove 'Goal' from the class names because conflict with namespace