diff --git a/action.go b/action.go
index a8ba020a..36d51837 100644
--- a/action.go
+++ b/action.go
@@ -106,7 +106,7 @@ func recordFlows() bool {
 	return b
 }
 
-func (f *ActionFactory) New(config *action.Config) (action.Action, error) {
+func (f *ActionFactory) New(config *action.ActionConfig) (action.Action, error) {
 
 	flowAction := &FlowAction{}
 
diff --git a/action_test.go b/action_test.go
index 528449d9..e6388e25 100644
--- a/action_test.go
+++ b/action_test.go
@@ -27,7 +27,7 @@ func (testInitCtx) ResourceManager() *resource.Manager {
 //TestInitNoFlavorError
 func TestInitNoFlavorError(t *testing.T) {
 
-	mockConfig := &action.Config{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: []byte(`{}`)}
+	mockConfig := &action.ActionConfig{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: []byte(`{}`)}
 	f := &ActionFactory{}
 	f.Initialize(&testInitCtx{})
 	_, err := f.New(mockConfig)
@@ -39,7 +39,7 @@ func TestInitUnCompressedFlowFlavorError(t *testing.T) {
 
 	mockFlowData := []byte(`{"flow":{}}`)
 
-	mockConfig := &action.Config{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
+	mockConfig := &action.ActionConfig{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
 
 	f := &ActionFactory{}
 	f.Initialize(&testInitCtx{})
@@ -52,7 +52,7 @@ func TestInitCompressedFlowFlavorError(t *testing.T) {
 
 	mockFlowData := []byte(`{"flowCompressed":""}`)
 
-	mockConfig := &action.Config{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
+	mockConfig := &action.ActionConfig{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
 
 	f := &ActionFactory{}
 	f.Initialize(&testInitCtx{})
@@ -65,7 +65,7 @@ func TestInitURIFlowFlavorError(t *testing.T) {
 
 	mockFlowData := []byte(`{"flowURI":""}`)
 
-	mockConfig := &action.Config{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
+	mockConfig := &action.ActionConfig{Id: "myMockConfig", Ref: "github.com/my/mock/ref", Data: mockFlowData}
 
 	f := &ActionFactory{}
 	f.Initialize(&testInitCtx{})
@@ -220,7 +220,7 @@ var testRestartInitialState = `{
 
 func TestFlowAction_Run_Restart(t *testing.T) {
 
-	cfg := &action.Config{}
+	cfg := &action.ActionConfig{}
 	err := json.Unmarshal([]byte(testFlowActionCfg), cfg)
 
 	if err != nil {
@@ -395,7 +395,7 @@ func TestRequestProcessor_RestartFlow(t *testing.T) {
 	af.Initialize(&testInitCtx{})
 
 	loader := resource.GetLoader("flow")
-	rConfig1 := &resource.Config{ID: "flow:flow1", Data: []byte(jsonFlow1)}
+	rConfig1 := &resource.ResourceConfig{ID: "flow:flow1", Data: []byte(jsonFlow1)}
 	_, err := loader.LoadResource(rConfig1)
 	assert.Nil(t, err)
 
diff --git a/activity/subflow/activity_test.go b/activity/subflow/activity_test.go
index dacee26e..3f0b7e88 100755
--- a/activity/subflow/activity_test.go
+++ b/activity/subflow/activity_test.go
@@ -185,7 +185,7 @@ func TestSubFlow(t *testing.T) {
 	err := initActionFactory(af)
 	assert.Nil(t, err)
 
-	flowAction, err := f.New(&action.Config{Settings: map[string]interface{}{"flowURI": "res://flow:flow1"}})
+	flowAction, err := f.New(&action.ActionConfig{Settings: map[string]interface{}{"flowURI": "res://flow:flow1"}})
 
 	assert.Nil(t, err)
 	assert.NotNil(t, flowAction)
@@ -201,8 +201,8 @@ func initActionFactory(af action.Factory) error {
 	ctx := test.NewActionInitCtx()
 	af.Initialize(ctx)
 
-	rConfig1 := &resource.Config{ID: "flow:flow1", Data: []byte(jsonFlow1)}
-	rConfig2 := &resource.Config{ID: "flow:flow2", Data: []byte(jsonFlow2)}
+	rConfig1 := &resource.ResourceConfig{ID: "flow:flow1", Data: []byte(jsonFlow1)}
+	rConfig2 := &resource.ResourceConfig{ID: "flow:flow2", Data: []byte(jsonFlow2)}
 
 	err := ctx.AddResource(support.RESTYPE_FLOW, rConfig1)
 	if err != nil {
diff --git a/support/resource.go b/support/resource.go
index 1edf0996..45de0de4 100644
--- a/support/resource.go
+++ b/support/resource.go
@@ -15,7 +15,7 @@ const (
 type FlowLoader struct {
 }
 
-func (*FlowLoader) LoadResource(config *resource.Config) (*resource.Resource, error) {
+func (*FlowLoader) LoadResource(config *resource.ResourceConfig) (*resource.Resource, error) {
 	var flowDefBytes []byte
 
 	flowDefBytes = config.Data
diff --git a/tester/request.go b/tester/request.go
index 0d26a4c1..e1f2f8a6 100644
--- a/tester/request.go
+++ b/tester/request.go
@@ -41,7 +41,7 @@ func (rp *RequestProcessor) StartFlow(startRequest *StartRequest) (results map[s
 	logger.Debugf("Tester starting flow")
 
 	factory := action.GetFactory(RefFlow)
-	act, _ := factory.New(&action.Config{})
+	act, _ := factory.New(&action.ActionConfig{})
 
 	var inputs map[string]interface{}
 
@@ -88,7 +88,7 @@ func (rp *RequestProcessor) RestartFlow(restartRequest *RestartRequest) (results
 	logger.Debugf("Tester restarting flow")
 
 	factory := action.GetFactory(RefFlow)
-	act, _ := factory.New(&action.Config{})
+	act, _ := factory.New(&action.ActionConfig{})
 
 	inputs := make(map[string]interface{}, len(restartRequest.Data)+1)
 
@@ -119,7 +119,7 @@ func (rp *RequestProcessor) ResumeFlow(resumeRequest *ResumeRequest) (results ma
 	logger.Debugf("Tester resuming flow")
 
 	factory := action.GetFactory(RefFlow)
-	act, _ := factory.New(&action.Config{})
+	act, _ := factory.New(&action.ActionConfig{})
 
 	inputs := make(map[string]interface{}, len(resumeRequest.Data)+1)