diff --git a/pkg/generate/mq_test.go b/pkg/generate/mq_test.go
index 4f54943f..bf8c637c 100644
--- a/pkg/generate/mq_test.go
+++ b/pkg/generate/mq_test.go
@@ -61,7 +61,7 @@ func TestMQ_GetOutputShapeGoType(t *testing.T) {
 	crd := testutil.GetCRDByName(t, g, "Broker")
 	require.NotNil(crd)
 
-	exp := "*svcsdkapi.CreateBrokerResponse"
+	exp := "*svcsdk.CreateBrokerResponse"
 	otype := crd.GetOutputShapeGoType(crd.Ops.Create)
 	assert.Equal(exp, otype)
 }
diff --git a/pkg/model/crd.go b/pkg/model/crd.go
index 781ce1b6..5779b2eb 100644
--- a/pkg/model/crd.go
+++ b/pkg/model/crd.go
@@ -367,7 +367,7 @@ func (r *CRD) SetOutputCustomMethodName(
 }
 
 // GetOutputShapeGoType returns the Go type of the supplied operation's Output
-// shape, renamed to use the standardized svcsdkapi alias.
+// shape, renamed to use the standardized svcsdk alias.
 func (r *CRD) GetOutputShapeGoType(
 	op *awssdkmodel.Operation,
 ) string {
@@ -376,7 +376,7 @@ func (r *CRD) GetOutputShapeGoType(
 	}
 	orig := op.OutputRef.GoType()
 	// orig will contain "*<OutputShape>" with no package specifier
-	return "*svcsdkapi." + orig[1:]
+	return "*svcsdk." + orig[1:]
 }
 
 // GetOutputWrapperFieldPath returns the JSON-Path of the output wrapper field
diff --git a/templates/pkg/resource/resource.go.tpl b/templates/pkg/resource/resource.go.tpl
index ef36e53f..c4b22e82 100644
--- a/templates/pkg/resource/resource.go.tpl
+++ b/templates/pkg/resource/resource.go.tpl
@@ -61,6 +61,11 @@ func (r *resource) Conditions() []*ackv1alpha1.Condition {
 	return r.ko.Status.Conditions
 }
 
+// ReplaceConditions sets the Conditions status field for the resource
+func (r *resource) ReplaceConditions(conditions []*ackv1alpha1.Condition) {
+	r.ko.Status.Conditions = conditions
+}
+
 // SetObjectMeta sets the ObjectMeta field for the resource
 func (r *resource) SetObjectMeta(meta metav1.ObjectMeta) {
 	r.ko.ObjectMeta = meta;