Repository: triggermesh/aws-event-sources
Pull request #156 (2020-06-11 13:16:35)

Rename AWS Cognito event sources
`AWSCognitoSource` event source renamed to `AWSCognitoIdentitySource`

related to #148, #155

antoineco: I'd keep the explicit `AWSCognitoUserPoolSource` name to avoid confusion.

Patch:
diff --git a/Makefile b/Makefile
index d9b95ae..03fbf53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 KREPO              = aws-event-sources
 KREPO_DESC         = Triggermesh AWS event sources
-COMMANDS           = aws-event-sources-controller awscodecommitsource awscognitosource awscognitouserpoolsource awsdynamodbsource awskinesissource awssqssource
+COMMANDS           = aws-event-sources-controller awscodecommitsource awscognitoidentitysource awscognitouserpoolsource awsdynamodbsource awskinesissource awssqssource
 
 TARGETS           ?= linux/amd64
 
diff --git a/README.md b/README.md
index 95e0814..a5bb0d0 100644
--- a/README.md
+++ b/README.md
@@ -10,15 +10,16 @@
 
 ## List of event sources
 
-| AWS service | Support level |
-|-------------|---------------|
-| CodeCommit  | alpha         |
-| Cognito     | alpha         |
-| DynamoDB    | alpha         |
-| IoT         | alpha/WIP     |
-| Kinesis     | alpha         |
-| SNS         | alpha         |
-| SQS         | alpha         |
+| AWS service     | Support level |
+|-----------------|---------------|
+| CodeCommit      | alpha         |
+| CognitoUserPool | alpha         |
+| CognitoIdentity | alpha         |
+| DynamoDB        | alpha         |
+| IoT             | alpha/WIP     |
+| Kinesis         | alpha         |
+| SNS             | alpha         |
+| SQS             | alpha         |
 
 ## Usage
 
diff --git a/cmd/aws-event-sources-controller/main.go b/cmd/aws-event-sources-controller/main.go
index 661f4ee..5a3aa4e 100644
--- a/cmd/aws-event-sources-controller/main.go
+++ b/cmd/aws-event-sources-controller/main.go
@@ -20,7 +20,7 @@ import (
 	"knative.dev/pkg/injection/sharedmain"
 
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awscodecommitsource"
-	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awscognitosource"
+	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awscognitoidentitysource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awscognitouserpoolsource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awsdynamodbsource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/awsiotsource"
@@ -32,7 +32,7 @@ import (
 func main() {
 	sharedmain.Main("aws-event-sources-controller",
 		awscodecommitsource.NewController,
-		awscognitosource.NewController,
+		awscognitoidentitysource.NewController,
 		awscognitouserpoolsource.NewController,
 		awsdynamodbsource.NewController,
 		awsiotsource.NewController,
diff --git a/cmd/awscognitosource/Dockerfile b/cmd/awscognitoidentitysource/Dockerfile
similarity index 64%
rename from cmd/awscognitosource/Dockerfile
rename to cmd/awscognitoidentitysource/Dockerfile
index 756f5a1..e84a648 100644
--- a/cmd/awscognitosource/Dockerfile
+++ b/cmd/awscognitoidentitysource/Dockerfile
@@ -4,13 +4,13 @@ ENV CGO_ENABLED 0
 ENV GOOS linux
 ENV GOARCH amd64
 
-WORKDIR /go/src/awscognitosource
+WORKDIR /go/src/awscognitoidentitysource
 
 COPY go.mod go.sum ./
 RUN go mod download
 
 COPY . .
-RUN BIN_OUTPUT_DIR=/bin make awscognitosource && \
+RUN BIN_OUTPUT_DIR=/bin make awscognitoidentitysource && \
     mkdir /kodata && \
     mv .git/* /kodata/ && \
     rm -rf ${GOPATH} && \
@@ -18,19 +18,19 @@ RUN BIN_OUTPUT_DIR=/bin make awscognitosource && \
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal
 
-LABEL name "Triggermesh AWS Cognito Event Source"
+LABEL name "Triggermesh AWS Cognito Identity Pool Event Source"
 LABEL vendor "Triggermesh"
 LABEL version "v0.1.0"
 LABEL release "1"
-LABEL summary "The Triggermesh Cognito Source"
-LABEL description "This is the Triggermesh Knative Event Source for AWS Cognito"
+LABEL summary "The Triggermesh Cognito Identity Pool Source"
+LABEL description "This is the Triggermesh Knative Event Source for AWS Cognito Identity Pool"
 
 # Emulate ko builds
 # https://github.com/google/ko/blob/v0.5.0/README.md#including-static-assets
 ENV KO_DATA_PATH /kodata
 
 COPY --from=builder /kodata/ ${KO_DATA_PATH}/
-COPY --from=builder /bin/awscognitosource /
+COPY --from=builder /bin/awscognitoidentitysource /
 COPY licenses/ /licenses/
 
-ENTRYPOINT ["/awscognitosource"]
+ENTRYPOINT ["/awscognitoidentitysource"]
diff --git a/cmd/awscognitosource/README.md b/cmd/awscognitoidentitysource/README.md
similarity index 82%
rename from cmd/awscognitosource/README.md
rename to cmd/awscognitoidentitysource/README.md
index 355a2d4..7c71b0a 100644
--- a/cmd/awscognitosource/README.md
+++ b/cmd/awscognitoidentitysource/README.md
@@ -7,7 +7,7 @@ sink.
 
 1. [Prerequisites](#prerequisites)
 1. [Deployment to Kubernetes](#deployment-to-kubernetes)
-   * [As a AWSCognitoSource object](#as-a-awscognitosource-object)
+   * [As a AWSCognitoIdentitySource object](#as-a-awscognitoidentitysource-object)
    * [As a ContainerSource object](#as-a-containersource-object)
    * [As a Deployment object bound by a SinkBinding](#as-a-deployment-object-bound-by-a-sinkbinding)
 1. [Running locally](#running-locally)
@@ -24,7 +24,7 @@ sink.
 
 The _AWS Cognito event source_ can be deployed to Kubernetes in different manners:
 
-* As an `AWSCognitoSource` object, to a cluster where the TriggerMesh _AWS Sources Controller_ is running.
+* As an `AWSCognitoIdentitySource` object, to a cluster where the TriggerMesh _AWS Sources Controller_ is running.
 * As a Knative `ContainerSource`, to any cluster running Knative Eventing.
 
 > :information_source: The sample manifests below reference AWS credentials (Access Key) from a Kubernetes Secret object
@@ -39,14 +39,14 @@ The _AWS Cognito event source_ can be deployed to Kubernetes in different manner
 > Alternatively, credentials can be used as literal strings instead of references to Kubernetes Secrets by replacing
 > `valueFrom` attributes with `value` inside API objects' manifests.
 
-### As a AWSCognitoSource object
+### As a AWSCognitoIdentitySource object
 
-Copy the sample manifest from `config/samples/awscognitosource.yaml` and replace the pre-filled `spec` attributes
-with the values corresponding to your _AWS Cognito_ identity pool. Then, create that `AWSCognitoSource` object in
+Copy the sample manifest from `config/samples/awscognitoidentitysource.yaml` and replace the pre-filled `spec` attributes
+with the values corresponding to your _AWS Cognito_ identity pool. Then, create that `AWSCognitoIdentitySource` object in
 your Kubernetes cluster:
 
 ```console
-$ kubectl -n <my_namespace> create -f my-awscognitosource.yaml
+$ kubectl -n <my_namespace> create -f my-awscognitoidentitysource.yaml
 ```
 
 ### As a ContainerSource object
@@ -81,16 +81,16 @@ Ensure the following environment variables are exported to your current shell's
 export ARN=<arn_of_my_identity_pool>
 export AWS_ACCESS_KEY_ID=<my_key_id>
 export AWS_SECRET_ACCESS_KEY=<my_secret_key>
-export NAME=my-awscognitosource
+export NAME=my-awscognitoidentitysource
 export NAMESPACE=default
 export K_LOGGING_CONFIG=''
-export K_METRICS_CONFIG='{"domain":"triggermesh.io/sources", "component":"awscognitosource", "configMap":{}}'
+export K_METRICS_CONFIG='{"domain":"triggermesh.io/sources", "component":"awscognitoidentitysource", "configMap":{}}'
 ```
 
 Then, run the event source with:
 
 ```console
-$ go run ./cmd/awscognitosource
+$ go run ./cmd/awscognitoidentitysource
 ```
 
 ### In a Docker container
@@ -102,11 +102,11 @@ $ docker run --rm \
   -e ARN=<arn_of_my_identity_pool> \
   -e AWS_ACCESS_KEY_ID=<my_key_id> \
   -e AWS_SECRET_ACCESS_KEY=<my_secret_key> \
-  -e NAME=my-awscognitosource \
+  -e NAME=my-awscognitoidentitysource \
   -e NAMESPACE=default \
   -e K_LOGGING_CONFIG='' \
-  -e K_METRICS_CONFIG='{"domain":"triggermesh.io/sources", "component":"awscognitosource", "configMap":{}}' \
-  gcr.io/triggermesh/awscognitosource:latest
+  -e K_METRICS_CONFIG='{"domain":"triggermesh.io/sources", "component":"awscognitoidentitysource", "configMap":{}}' \
+  gcr.io/triggermesh/awscognitoidentitysource:latest
 ```
 
 [doc-accesskey]: https://docs.aws.amazon.com/general/latest/gr/aws-sec-cred-types.html#access-keys-and-secret-access-keys
diff --git a/cmd/awscognitosource/kodata/HEAD b/cmd/awscognitoidentitysource/kodata/HEAD
similarity index 100%
rename from cmd/awscognitosource/kodata/HEAD
rename to cmd/awscognitoidentitysource/kodata/HEAD
diff --git a/cmd/awscognitosource/kodata/refs b/cmd/awscognitoidentitysource/kodata/refs
similarity index 100%
rename from cmd/awscognitosource/kodata/refs
rename to cmd/awscognitoidentitysource/kodata/refs
diff --git a/cmd/awscognitosource/main.go b/cmd/awscognitoidentitysource/main.go
similarity index 84%
rename from cmd/awscognitosource/main.go
rename to cmd/awscognitoidentitysource/main.go
index 9120d09..19c9cd0 100644
--- a/cmd/awscognitosource/main.go
+++ b/cmd/awscognitoidentitysource/main.go
@@ -19,9 +19,9 @@ package main
 import (
 	"knative.dev/eventing/pkg/adapter/v2"
 
-	"github.com/triggermesh/aws-event-sources/pkg/adapter/awscognitosource"
+	"github.com/triggermesh/aws-event-sources/pkg/adapter/awscognitoidentitysource"
 )
 
 func main() {
-	adapter.Main("awscognitosource", awscognitosource.NewEnvConfig, awscognitosource.NewAdapter)
+	adapter.Main("awscognitoidentitysource", awscognitoidentitysource.NewEnvConfig, awscognitoidentitysource.NewAdapter)
 }
diff --git a/config/200-clusterroles.yaml b/config/200-clusterroles.yaml
index 80a3d0f..911c100 100644
--- a/config/200-clusterroles.yaml
+++ b/config/200-clusterroles.yaml
@@ -52,7 +52,7 @@ rules:
   - sources.triggermesh.io
   resources:
   - awscodecommitsources
-  - awscognitosources
+  - awscognitoidentitysources
   - awscognitouserpoolsources
   - awsdynamodbsources
   - awsiotsources
@@ -68,7 +68,7 @@ rules:
   - sources.triggermesh.io
   resources:
   - awscodecommitsources/status
-  - awscognitosources/status
+  - awscognitoidentitysources/status
   - awscognitouserpoolsources/status
   - awsdynamodbsources/status
   - awsiotsources/status
@@ -134,7 +134,7 @@ rules:
   - sources.triggermesh.io
   resources:
   - awscodecommitsources
-  - awscognitosources
+  - awscognitoidentitysources
   - awscognitouserpoolsources
   - awsdynamodbsources
   - awsiotsources
diff --git a/config/300-awscognito.yaml b/config/300-awscognitoidentity.yaml
similarity index 96%
rename from config/300-awscognito.yaml
rename to config/300-awscognitoidentity.yaml
index 10a54dc..10dfde7 100644
--- a/config/300-awscognito.yaml
+++ b/config/300-awscognitoidentity.yaml
@@ -15,7 +15,7 @@
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
-  name: awscognitosources.sources.triggermesh.io
+  name: awscognitoidentitysources.sources.triggermesh.io
   labels:
     eventing.knative.dev/source: 'true'
     duck.knative.dev/source: 'true'
@@ -23,14 +23,14 @@ metadata:
   annotations:
     registry.knative.dev/eventTypes: |
       [
-        { "type": "com.amazon.cognito.sync_trigger" }
+        { "type": "com.amazon.cognito-identity.sync_trigger" }
       ]
 spec:
   group: sources.triggermesh.io
   scope: Namespaced
   names:
-    kind: AWSCognitoSource
-    plural: awscognitosources
+    kind: AWSCognitoIdentitySource
+    plural: awscognitoidentitysources
     categories:
     - all
     - knative
diff --git a/config/500-controller.yaml b/config/500-controller.yaml
index 3753692..89a7ba1 100644
--- a/config/500-controller.yaml
+++ b/config/500-controller.yaml
@@ -57,8 +57,8 @@ spec:
         # Source adapters
         - name: AWSCODECOMMITSOURCE_IMAGE
           value: ko://github.com/triggermesh/aws-event-sources/cmd/awscodecommitsource
-        - name: AWSCOGNITOSOURCE_IMAGE
-          value: ko://github.com/triggermesh/aws-event-sources/cmd/awscognitosource
+        - name: AWSCOGNITOIDENTITYSOURCE_IMAGE
+          value: ko://github.com/triggermesh/aws-event-sources/cmd/awscognitoidentitysource
         - name: AWSCOGNITOUSERPOOLSOURCE_IMAGE
           value: ko://github.com/triggermesh/aws-event-sources/cmd/awscognitouserpoolsource
         - name: AWSDYNAMODBSOURCE_IMAGE
diff --git a/config/samples/awscognito-containersource.yaml b/config/samples/awscognitoidentity-containersource.yaml
similarity index 93%
rename from config/samples/awscognito-containersource.yaml
rename to config/samples/awscognitoidentity-containersource.yaml
index b614e0b..3dcff73 100644
--- a/config/samples/awscognito-containersource.yaml
+++ b/config/samples/awscognitoidentity-containersource.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
       - name: source
-        image: gcr.io/triggermesh/awscognitosource:latest
+        image: gcr.io/triggermesh/awscognitoidentitysource:latest
 
         env:
 
@@ -56,7 +56,7 @@ spec:
           value: |
             {
               "domain": "triggermesh.io/sources",
-              "component": "awscognitosource",
+              "component": "awscognitoidentitysource",
               "configMap": {}
             }
 
diff --git a/config/samples/awscognito-sinkbinding.yaml b/config/samples/awscognitoidentity-sinkbinding.yaml
similarity index 94%
rename from config/samples/awscognito-sinkbinding.yaml
rename to config/samples/awscognitoidentity-sinkbinding.yaml
index a1867ac..128a3fd 100644
--- a/config/samples/awscognito-sinkbinding.yaml
+++ b/config/samples/awscognitoidentity-sinkbinding.yaml
@@ -49,7 +49,7 @@ spec:
     spec:
       containers:
       - name: source
-        image: gcr.io/triggermesh/awscognitosource:latest
+        image: gcr.io/triggermesh/awscognitoidentitysource:latest
 
         env:
 
@@ -82,6 +82,6 @@ spec:
           value: |
             {
               "domain": "triggermesh.io/sources",
-              "component": "awscognitosource",
+              "component": "awscognitoidentitysource",
               "configMap": {}
             }
diff --git a/config/samples/awscognitosource.yaml b/config/samples/awscognitoidentitysource.yaml
similarity index 93%
rename from config/samples/awscognitosource.yaml
rename to config/samples/awscognitoidentitysource.yaml
index d7d8fc0..5fe0464 100644
--- a/config/samples/awscognitosource.yaml
+++ b/config/samples/awscognitoidentitysource.yaml
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Sample AWSCognitoSource object.
+# Sample AWSCognitoIdentitySource object.
 
 apiVersion: sources.triggermesh.io/v1alpha1
-kind: AWSCognitoSource
+kind: AWSCognitoIdentitySource
 metadata:
   name: sample
 spec:
diff --git a/config/samples/awscognitouserpoolsource.yaml b/config/samples/awscognitouserpoolsource.yaml
index edc4714..1e7917f 100644
--- a/config/samples/awscognitouserpoolsource.yaml
+++ b/config/samples/awscognitouserpoolsource.yaml
@@ -36,4 +36,3 @@ spec:
       apiVersion: eventing.knative.dev/v1beta1
       kind: Broker
       name: default
-
diff --git a/pkg/adapter/awscognitosource/adapter.go b/pkg/adapter/awscognitoidentitysource/adapter.go
similarity index 97%
rename from pkg/adapter/awscognitosource/adapter.go
rename to pkg/adapter/awscognitoidentitysource/adapter.go
index f47d5f7..cdb1da9 100644
--- a/pkg/adapter/awscognitosource/adapter.go
+++ b/pkg/adapter/awscognitoidentitysource/adapter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"context"
@@ -85,7 +85,7 @@ func NewAdapter(ctx context.Context, envAcc pkgadapter.EnvConfigAccessor, ceClie
 		ceClient:          ceClient,
 
 		arn:            arn,
-		identityPoolID: common.MustParseCognitoResource(arn.Resource),
+		identityPoolID: common.MustParseCognitoIdentityResource(arn.Resource),
 	}
 }
 
@@ -207,7 +207,7 @@ func (a *adapter) getRecords(dataset *cognitosync.Dataset) ([]*cognitosync.Recor
 func (a *adapter) sendCognitoEvent(dataset *cognitosync.Dataset, records []*cognitosync.Record) error {
 	a.logger.Info("Processing Dataset: ", *dataset.DatasetName)
 
-	data := &CognitoSyncEvent{
+	data := &CognitoIdentitySyncEvent{
 		CreationDate:     dataset.CreationDate,
 		DataStorage:      dataset.DataStorage,
 		DatasetName:      dataset.DatasetName,
@@ -222,7 +222,7 @@ func (a *adapter) sendCognitoEvent(dataset *cognitosync.Dataset, records []*cogn
 	}
 
 	event := cloudevents.NewEvent(cloudevents.VersionV1)
-	event.SetType(v1alpha1.AWSEventType(a.arn.Service, v1alpha1.AWSCognitoGenericEventType))
+	event.SetType(v1alpha1.AWSEventType(a.arn.Service, v1alpha1.AWSCognitoIdentityGenericEventType))
 	event.SetSubject(*dataset.DatasetName)
 	event.SetSource(a.arn.String())
 	event.SetID(*dataset.IdentityId)
diff --git a/pkg/adapter/awscognitosource/events.go b/pkg/adapter/awscognitoidentitysource/events.go
similarity index 86%
rename from pkg/adapter/awscognitosource/events.go
rename to pkg/adapter/awscognitoidentitysource/events.go
index b9b7c37..afc532d 100644
--- a/pkg/adapter/awscognitosource/events.go
+++ b/pkg/adapter/awscognitoidentitysource/events.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"time"
@@ -22,8 +22,8 @@ import (
 	"github.com/aws/aws-sdk-go/service/cognitosync"
 )
 
-// CognitoSyncEvent represents the payload of a Cognito sync event.
-type CognitoSyncEvent struct {
+// CognitoIdentitySyncEvent represents the payload of a Cognito sync event.
+type CognitoIdentitySyncEvent struct {
 	CreationDate     *time.Time
 	DataStorage      *int64
 	DatasetName      *string
diff --git a/pkg/adapter/awscognitouserpoolsource/adapter.go b/pkg/adapter/awscognitouserpoolsource/adapter.go
index b0cae46..7e6073f 100644
--- a/pkg/adapter/awscognitouserpoolsource/adapter.go
+++ b/pkg/adapter/awscognitouserpoolsource/adapter.go
@@ -83,7 +83,7 @@ func NewAdapter(ctx context.Context, envAcc pkgadapter.EnvConfigAccessor, ceClie
 		ceClient:          ceClient,
 
 		arn:        arn,
-		userPoolID: common.MustParseCognitoUserPoolID(arn.Resource),
+		userPoolID: common.MustParseCognitoUserPoolResource(arn.Resource),
 	}
 }
 
diff --git a/pkg/adapter/common/common.go b/pkg/adapter/common/common.go
index f976a5c..cb065e7 100644
--- a/pkg/adapter/common/common.go
+++ b/pkg/adapter/common/common.go
@@ -25,8 +25,8 @@ import (
 )
 
 const (
-	expectCognitoResourceFmt         = "identitypool/${IdentityPoolId}"
 	expectCognitoUserPoolResourceFmt = "userpool/${UserPoolId}"
+	expectCognitoIdentityResourceFmt = "identitypool/${IdentityPoolId}"
 	expectDynamoDBResourceFmt        = "table/${TableName}"
 	expectKinesisResourceFmt         = "stream/${StreamName}"
 )
@@ -40,10 +40,10 @@ func MustParseARN(arnStr string) arn.ARN {
 	return arn
 }
 
-// MustParseCognitoResource parses the resource segment of a Cognito ARN and
-// panics in case of error.
-func MustParseCognitoResource(resource string) string /*identityPoolId*/ {
-	elements, err := parseResource(resource, expectCognitoResourceFmt)
+// MustParseCognitoIdentityResource parses the resource segment of a Cognito
+// Identity Pool ARN and panics in case of error.
+func MustParseCognitoIdentityResource(resource string) string /*identityPoolId*/ {
+	elements, err := parseResource(resource, expectCognitoIdentityResourceFmt)
 	if err != nil {
 		panic(err)
 	}
@@ -70,9 +70,9 @@ func MustParseKinesisResource(resource string) string /*stream*/ {
 	return elements[0]
 }
 
-// MustParseCognitoUserPoolID parses the resource segment of a Cognito User Pool
+// MustParseCognitoUserPoolResource parses the resource segment of a Cognito User Pool
 // ARN and panics in case of error.
-func MustParseCognitoUserPoolID(resource string) string {
+func MustParseCognitoUserPoolResource(resource string) string {
 	elements, err := parseResource(resource, expectCognitoUserPoolResourceFmt)
 	if err != nil {
 		panic(err)
diff --git a/pkg/apis/sources/register.go b/pkg/apis/sources/register.go
index 3823149..3c5b104 100644
--- a/pkg/apis/sources/register.go
+++ b/pkg/apis/sources/register.go
@@ -28,14 +28,14 @@ var (
 		Resource: "awscodecommitsources",
 	}
 
-	// AWSCognitoSourceResource respresents an event source for AWS Cognito.
-	AWSCognitoSourceResource = schema.GroupResource{
+	// AWSCognitoIdentitySourceResource respresents an event source for AWS Cognito.
+	AWSCognitoIdentitySourceResource = schema.GroupResource{
 		Group:    GroupName,
-		Resource: "awscognitosources",
+		Resource: "awscognitoidentitysources",
 	}
 
 	// AWSCognitoUserPoolSourceResource respresents an event source for AWS Cognito User Pool.
-	AWSCognitoSourceUserPoolResource = schema.GroupResource{
+	AWSCognitoUserPoolSourceResource = schema.GroupResource{
 		Group:    GroupName,
 		Resource: "awscognitouserpoolsources",
 	}
diff --git a/pkg/apis/sources/v1alpha1/awscognito_defaults.go b/pkg/apis/sources/v1alpha1/awscognitoidentity_defaults.go
similarity index 90%
rename from pkg/apis/sources/v1alpha1/awscognito_defaults.go
rename to pkg/apis/sources/v1alpha1/awscognitoidentity_defaults.go
index 3935d4c..20039df 100644
--- a/pkg/apis/sources/v1alpha1/awscognito_defaults.go
+++ b/pkg/apis/sources/v1alpha1/awscognitoidentity_defaults.go
@@ -19,4 +19,4 @@ package v1alpha1
 import "context"
 
 // SetDefaults implements apis.Defaultable.
-func (s *AWSCognitoSource) SetDefaults(_ context.Context) {}
+func (s *AWSCognitoIdentitySource) SetDefaults(_ context.Context) {}
diff --git a/pkg/apis/sources/v1alpha1/awscognito_lifecycle.go b/pkg/apis/sources/v1alpha1/awscognitoidentity_lifecycle.go
similarity index 65%
rename from pkg/apis/sources/v1alpha1/awscognito_lifecycle.go
rename to pkg/apis/sources/v1alpha1/awscognitoidentity_lifecycle.go
index 24558db..1d7e39d 100644
--- a/pkg/apis/sources/v1alpha1/awscognito_lifecycle.go
+++ b/pkg/apis/sources/v1alpha1/awscognitoidentity_lifecycle.go
@@ -22,38 +22,38 @@ import (
 )
 
 // GetGroupVersionKind implements kmeta.OwnerRefable.
-func (s *AWSCognitoSource) GetGroupVersionKind() schema.GroupVersionKind {
-	return SchemeGroupVersion.WithKind("AWSCognitoSource")
+func (s *AWSCognitoIdentitySource) GetGroupVersionKind() schema.GroupVersionKind {
+	return SchemeGroupVersion.WithKind("AWSCognitoIdentitySource")
 }
 
 // GetUntypedSpec implements apis.HasSpec.
-func (s *AWSCognitoSource) GetUntypedSpec() interface{} {
+func (s *AWSCognitoIdentitySource) GetUntypedSpec() interface{} {
 	return s.Spec
 }
 
 // GetSink implements AWSEventSource.
-func (s *AWSCognitoSource) GetSink() *duckv1.Destination {
+func (s *AWSCognitoIdentitySource) GetSink() *duckv1.Destination {
 	return &s.Spec.Sink
 }
 
 // GetARN implements AWSEventSource.
-func (s *AWSCognitoSource) GetARN() string {
+func (s *AWSCognitoIdentitySource) GetARN() string {
 	return s.Spec.ARN
 }
 
 // GetStatus implements AWSEventSource.
-func (s *AWSCognitoSource) GetStatus() *AWSEventSourceStatus {
+func (s *AWSCognitoIdentitySource) GetStatus() *AWSEventSourceStatus {
 	return &s.Status
 }
 
 // Supported event types
 const (
-	AWSCognitoGenericEventType = "sync_trigger"
+	AWSCognitoIdentityGenericEventType = "sync_trigger"
 )
 
 // GetEventTypes implements AWSEventSource.
-func (s *AWSCognitoSource) GetEventTypes() []string {
+func (s *AWSCognitoIdentitySource) GetEventTypes() []string {
 	return []string{
-		AWSCognitoGenericEventType,
+		AWSCognitoIdentityGenericEventType,
 	}
 }
diff --git a/pkg/apis/sources/v1alpha1/awscognito_types.go b/pkg/apis/sources/v1alpha1/awscognitoidentity_types.go
similarity index 63%
rename from pkg/apis/sources/v1alpha1/awscognito_types.go
rename to pkg/apis/sources/v1alpha1/awscognitoidentity_types.go
index b6792dd..ed3a30b 100644
--- a/pkg/apis/sources/v1alpha1/awscognito_types.go
+++ b/pkg/apis/sources/v1alpha1/awscognitoidentity_types.go
@@ -29,27 +29,27 @@ import (
 // +genreconciler
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// AWSCognitoSource is the Schema for the event source.
-type AWSCognitoSource struct {
+// AWSCognitoIdentitySource is the Schema for the event source.
+type AWSCognitoIdentitySource struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   AWSCognitoSourceSpec `json:"spec,omitempty"`
-	Status AWSEventSourceStatus `json:"status,omitempty"`
+	Spec   AWSCognitoIdentitySourceSpec `json:"spec,omitempty"`
+	Status AWSEventSourceStatus         `json:"status,omitempty"`
 }
 
 // Check the interfaces the event source should be implementing.
 var (
-	_ runtime.Object     = (*AWSCognitoSource)(nil)
-	_ kmeta.OwnerRefable = (*AWSCognitoSource)(nil)
-	_ apis.Validatable   = (*AWSCognitoSource)(nil)
-	_ apis.Defaultable   = (*AWSCognitoSource)(nil)
-	_ apis.HasSpec       = (*AWSCognitoSource)(nil)
-	_ AWSEventSource     = (*AWSCognitoSource)(nil)
+	_ runtime.Object     = (*AWSCognitoIdentitySource)(nil)
+	_ kmeta.OwnerRefable = (*AWSCognitoIdentitySource)(nil)
+	_ apis.Validatable   = (*AWSCognitoIdentitySource)(nil)
+	_ apis.Defaultable   = (*AWSCognitoIdentitySource)(nil)
+	_ apis.HasSpec       = (*AWSCognitoIdentitySource)(nil)
+	_ AWSEventSource     = (*AWSCognitoIdentitySource)(nil)
 )
 
-// AWSCognitoSourceSpec defines the desired state of the event source.
-type AWSCognitoSourceSpec struct {
+// AWSCognitoIdentitySourceSpec defines the desired state of the event source.
+type AWSCognitoIdentitySourceSpec struct {
 	duckv1.SourceSpec `json:",inline"`
 
 	// Identity Pool ARN
@@ -62,9 +62,9 @@ type AWSCognitoSourceSpec struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// AWSCognitoSourceList contains a list of event sources.
-type AWSCognitoSourceList struct {
+// AWSCognitoIdentitySourceList contains a list of event sources.
+type AWSCognitoIdentitySourceList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []AWSCognitoSource `json:"items"`
+	Items           []AWSCognitoIdentitySource `json:"items"`
 }
diff --git a/pkg/apis/sources/v1alpha1/awscognito_validation.go b/pkg/apis/sources/v1alpha1/awscognitoidentity_validation.go
similarity index 87%
rename from pkg/apis/sources/v1alpha1/awscognito_validation.go
rename to pkg/apis/sources/v1alpha1/awscognitoidentity_validation.go
index 849b24b..75c132b 100644
--- a/pkg/apis/sources/v1alpha1/awscognito_validation.go
+++ b/pkg/apis/sources/v1alpha1/awscognitoidentity_validation.go
@@ -23,4 +23,4 @@ import (
 )
 
 // Validate implements apis.Validatable.
-func (s *AWSCognitoSource) Validate(_ context.Context) *apis.FieldError { return nil }
+func (s *AWSCognitoIdentitySource) Validate(_ context.Context) *apis.FieldError { return nil }
diff --git a/pkg/apis/sources/v1alpha1/awscognitouserpool_lifecycle.go b/pkg/apis/sources/v1alpha1/awscognitouserpool_lifecycle.go
index 2c7b0b2..cf2e540 100644
--- a/pkg/apis/sources/v1alpha1/awscognitouserpool_lifecycle.go
+++ b/pkg/apis/sources/v1alpha1/awscognitouserpool_lifecycle.go
@@ -48,12 +48,12 @@ func (s *AWSCognitoUserPoolSource) GetStatus() *AWSEventSourceStatus {
 
 // Supported event types
 const (
-	AWSCognitoUserPoolGenericEventType = "sync_trigger"
+	AWSCognitoGenericEventType = "sync_trigger"
 )
 
 // GetEventTypes implements AWSEventSource.
 func (s *AWSCognitoUserPoolSource) GetEventTypes() []string {
 	return []string{
-		AWSCognitoUserPoolGenericEventType,
+		AWSCognitoGenericEventType,
 	}
 }
diff --git a/pkg/apis/sources/v1alpha1/deepcopy_generated.go b/pkg/apis/sources/v1alpha1/deepcopy_generated.go
index 0656071..d594903 100644
--- a/pkg/apis/sources/v1alpha1/deepcopy_generated.go
+++ b/pkg/apis/sources/v1alpha1/deepcopy_generated.go
@@ -110,7 +110,7 @@ func (in *AWSCodeCommitSourceSpec) DeepCopy() *AWSCodeCommitSourceSpec {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AWSCognitoSource) DeepCopyInto(out *AWSCognitoSource) {
+func (in *AWSCognitoIdentitySource) DeepCopyInto(out *AWSCognitoIdentitySource) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
@@ -119,18 +119,18 @@ func (in *AWSCognitoSource) DeepCopyInto(out *AWSCognitoSource) {
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoSource.
-func (in *AWSCognitoSource) DeepCopy() *AWSCognitoSource {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoIdentitySource.
+func (in *AWSCognitoIdentitySource) DeepCopy() *AWSCognitoIdentitySource {
 	if in == nil {
 		return nil
 	}
-	out := new(AWSCognitoSource)
+	out := new(AWSCognitoIdentitySource)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AWSCognitoSource) DeepCopyObject() runtime.Object {
+func (in *AWSCognitoIdentitySource) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -138,13 +138,13 @@ func (in *AWSCognitoSource) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AWSCognitoSourceList) DeepCopyInto(out *AWSCognitoSourceList) {
+func (in *AWSCognitoIdentitySourceList) DeepCopyInto(out *AWSCognitoIdentitySourceList) {
 	*out = *in
 	out.TypeMeta = in.TypeMeta
 	in.ListMeta.DeepCopyInto(&out.ListMeta)
 	if in.Items != nil {
 		in, out := &in.Items, &out.Items
-		*out = make([]AWSCognitoSource, len(*in))
+		*out = make([]AWSCognitoIdentitySource, len(*in))
 		for i := range *in {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
@@ -152,18 +152,18 @@ func (in *AWSCognitoSourceList) DeepCopyInto(out *AWSCognitoSourceList) {
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoSourceList.
-func (in *AWSCognitoSourceList) DeepCopy() *AWSCognitoSourceList {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoIdentitySourceList.
+func (in *AWSCognitoIdentitySourceList) DeepCopy() *AWSCognitoIdentitySourceList {
 	if in == nil {
 		return nil
 	}
-	out := new(AWSCognitoSourceList)
+	out := new(AWSCognitoIdentitySourceList)
 	in.DeepCopyInto(out)
 	return out
 }
 
 // DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
-func (in *AWSCognitoSourceList) DeepCopyObject() runtime.Object {
+func (in *AWSCognitoIdentitySourceList) DeepCopyObject() runtime.Object {
 	if c := in.DeepCopy(); c != nil {
 		return c
 	}
@@ -171,19 +171,19 @@ func (in *AWSCognitoSourceList) DeepCopyObject() runtime.Object {
 }
 
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *AWSCognitoSourceSpec) DeepCopyInto(out *AWSCognitoSourceSpec) {
+func (in *AWSCognitoIdentitySourceSpec) DeepCopyInto(out *AWSCognitoIdentitySourceSpec) {
 	*out = *in
 	in.SourceSpec.DeepCopyInto(&out.SourceSpec)
 	in.Credentials.DeepCopyInto(&out.Credentials)
 	return
 }
 
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoSourceSpec.
-func (in *AWSCognitoSourceSpec) DeepCopy() *AWSCognitoSourceSpec {
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AWSCognitoIdentitySourceSpec.
+func (in *AWSCognitoIdentitySourceSpec) DeepCopy() *AWSCognitoIdentitySourceSpec {
 	if in == nil {
 		return nil
 	}
-	out := new(AWSCognitoSourceSpec)
+	out := new(AWSCognitoIdentitySourceSpec)
 	in.DeepCopyInto(out)
 	return out
 }
diff --git a/pkg/apis/sources/v1alpha1/register.go b/pkg/apis/sources/v1alpha1/register.go
index 2152ea3..9f157c4 100644
--- a/pkg/apis/sources/v1alpha1/register.go
+++ b/pkg/apis/sources/v1alpha1/register.go
@@ -37,7 +37,7 @@ var (
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&AWSCodeCommitSource{}, &AWSCodeCommitSourceList{},
-		&AWSCognitoSource{}, &AWSCognitoSourceList{},
+		&AWSCognitoIdentitySource{}, &AWSCognitoUserPoolSourceList{},
 		&AWSCognitoUserPoolSource{}, &AWSCognitoUserPoolSourceList{},
 		&AWSDynamoDBSource{}, &AWSDynamoDBSourceList{},
 		&AWSIoTSource{}, &AWSIoTSourceList{},
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitoidentitysource.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitoidentitysource.go
new file mode 100644
index 0000000..211f532
--- /dev/null
+++ b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitoidentitysource.go
@@ -0,0 +1,191 @@
+/*
+Copyright (c) 2020 TriggerMesh Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"time"
+
+	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
+	scheme "github.com/triggermesh/aws-event-sources/pkg/client/generated/clientset/internalclientset/scheme"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	rest "k8s.io/client-go/rest"
+)
+
+// AWSCognitoIdentitySourcesGetter has a method to return a AWSCognitoIdentitySourceInterface.
+// A group's client should implement this interface.
+type AWSCognitoIdentitySourcesGetter interface {
+	AWSCognitoIdentitySources(namespace string) AWSCognitoIdentitySourceInterface
+}
+
+// AWSCognitoIdentitySourceInterface has methods to work with AWSCognitoIdentitySource resources.
+type AWSCognitoIdentitySourceInterface interface {
+	Create(*v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error)
+	Update(*v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error)
+	UpdateStatus(*v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error)
+	Delete(name string, options *v1.DeleteOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	Get(name string, options v1.GetOptions) (*v1alpha1.AWSCognitoIdentitySource, error)
+	List(opts v1.ListOptions) (*v1alpha1.AWSCognitoIdentitySourceList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoIdentitySource, err error)
+	AWSCognitoIdentitySourceExpansion
+}
+
+// aWSCognitoIdentitySources implements AWSCognitoIdentitySourceInterface
+type aWSCognitoIdentitySources struct {
+	client rest.Interface
+	ns     string
+}
+
+// newAWSCognitoIdentitySources returns a AWSCognitoIdentitySources
+func newAWSCognitoIdentitySources(c *SourcesV1alpha1Client, namespace string) *aWSCognitoIdentitySources {
+	return &aWSCognitoIdentitySources{
+		client: c.RESTClient(),
+		ns:     namespace,
+	}
+}
+
+// Get takes name of the aWSCognitoIdentitySource, and returns the corresponding aWSCognitoIdentitySource object, and an error if there is any.
+func (c *aWSCognitoIdentitySources) Get(name string, options v1.GetOptions) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	result = &v1alpha1.AWSCognitoIdentitySource{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		Name(name).
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of AWSCognitoIdentitySources that match those selectors.
+func (c *aWSCognitoIdentitySources) List(opts v1.ListOptions) (result *v1alpha1.AWSCognitoIdentitySourceList, err error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	result = &v1alpha1.AWSCognitoIdentitySourceList{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Do().
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested aWSCognitoIdentitySources.
+func (c *aWSCognitoIdentitySources) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	opts.Watch = true
+	return c.client.Get().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Watch()
+}
+
+// Create takes the representation of a aWSCognitoIdentitySource and creates it.  Returns the server's representation of the aWSCognitoIdentitySource, and an error, if there is any.
+func (c *aWSCognitoIdentitySources) Create(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	result = &v1alpha1.AWSCognitoIdentitySource{}
+	err = c.client.Post().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		Body(aWSCognitoIdentitySource).
+		Do().
+		Into(result)
+	return
+}
+
+// Update takes the representation of a aWSCognitoIdentitySource and updates it. Returns the server's representation of the aWSCognitoIdentitySource, and an error, if there is any.
+func (c *aWSCognitoIdentitySources) Update(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	result = &v1alpha1.AWSCognitoIdentitySource{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		Name(aWSCognitoIdentitySource.Name).
+		Body(aWSCognitoIdentitySource).
+		Do().
+		Into(result)
+	return
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+
+func (c *aWSCognitoIdentitySources) UpdateStatus(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	result = &v1alpha1.AWSCognitoIdentitySource{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		Name(aWSCognitoIdentitySource.Name).
+		SubResource("status").
+		Body(aWSCognitoIdentitySource).
+		Do().
+		Into(result)
+	return
+}
+
+// Delete takes name of the aWSCognitoIdentitySource and deletes it. Returns an error if one occurs.
+func (c *aWSCognitoIdentitySources) Delete(name string, options *v1.DeleteOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		Name(name).
+		Body(options).
+		Do().
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *aWSCognitoIdentitySources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	var timeout time.Duration
+	if listOptions.TimeoutSeconds != nil {
+		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
+	}
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		VersionedParams(&listOptions, scheme.ParameterCodec).
+		Timeout(timeout).
+		Body(options).
+		Do().
+		Error()
+}
+
+// Patch applies the patch and returns the patched aWSCognitoIdentitySource.
+func (c *aWSCognitoIdentitySources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	result = &v1alpha1.AWSCognitoIdentitySource{}
+	err = c.client.Patch(pt).
+		Namespace(c.ns).
+		Resource("awscognitoidentitysources").
+		SubResource(subresources...).
+		Name(name).
+		Body(data).
+		Do().
+		Into(result)
+	return
+}
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitosource.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitosource.go
deleted file mode 100644
index 122cf44..0000000
--- a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/awscognitosource.go
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
-Copyright (c) 2020 TriggerMesh Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	"time"
-
-	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	scheme "github.com/triggermesh/aws-event-sources/pkg/client/generated/clientset/internalclientset/scheme"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	rest "k8s.io/client-go/rest"
-)
-
-// AWSCognitoSourcesGetter has a method to return a AWSCognitoSourceInterface.
-// A group's client should implement this interface.
-type AWSCognitoSourcesGetter interface {
-	AWSCognitoSources(namespace string) AWSCognitoSourceInterface
-}
-
-// AWSCognitoSourceInterface has methods to work with AWSCognitoSource resources.
-type AWSCognitoSourceInterface interface {
-	Create(*v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error)
-	Update(*v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error)
-	UpdateStatus(*v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error)
-	Delete(name string, options *v1.DeleteOptions) error
-	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
-	Get(name string, options v1.GetOptions) (*v1alpha1.AWSCognitoSource, error)
-	List(opts v1.ListOptions) (*v1alpha1.AWSCognitoSourceList, error)
-	Watch(opts v1.ListOptions) (watch.Interface, error)
-	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoSource, err error)
-	AWSCognitoSourceExpansion
-}
-
-// aWSCognitoSources implements AWSCognitoSourceInterface
-type aWSCognitoSources struct {
-	client rest.Interface
-	ns     string
-}
-
-// newAWSCognitoSources returns a AWSCognitoSources
-func newAWSCognitoSources(c *SourcesV1alpha1Client, namespace string) *aWSCognitoSources {
-	return &aWSCognitoSources{
-		client: c.RESTClient(),
-		ns:     namespace,
-	}
-}
-
-// Get takes name of the aWSCognitoSource, and returns the corresponding aWSCognitoSource object, and an error if there is any.
-func (c *aWSCognitoSources) Get(name string, options v1.GetOptions) (result *v1alpha1.AWSCognitoSource, err error) {
-	result = &v1alpha1.AWSCognitoSource{}
-	err = c.client.Get().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		Name(name).
-		VersionedParams(&options, scheme.ParameterCodec).
-		Do().
-		Into(result)
-	return
-}
-
-// List takes label and field selectors, and returns the list of AWSCognitoSources that match those selectors.
-func (c *aWSCognitoSources) List(opts v1.ListOptions) (result *v1alpha1.AWSCognitoSourceList, err error) {
-	var timeout time.Duration
-	if opts.TimeoutSeconds != nil {
-		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
-	}
-	result = &v1alpha1.AWSCognitoSourceList{}
-	err = c.client.Get().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Timeout(timeout).
-		Do().
-		Into(result)
-	return
-}
-
-// Watch returns a watch.Interface that watches the requested aWSCognitoSources.
-func (c *aWSCognitoSources) Watch(opts v1.ListOptions) (watch.Interface, error) {
-	var timeout time.Duration
-	if opts.TimeoutSeconds != nil {
-		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
-	}
-	opts.Watch = true
-	return c.client.Get().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		VersionedParams(&opts, scheme.ParameterCodec).
-		Timeout(timeout).
-		Watch()
-}
-
-// Create takes the representation of a aWSCognitoSource and creates it.  Returns the server's representation of the aWSCognitoSource, and an error, if there is any.
-func (c *aWSCognitoSources) Create(aWSCognitoSource *v1alpha1.AWSCognitoSource) (result *v1alpha1.AWSCognitoSource, err error) {
-	result = &v1alpha1.AWSCognitoSource{}
-	err = c.client.Post().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		Body(aWSCognitoSource).
-		Do().
-		Into(result)
-	return
-}
-
-// Update takes the representation of a aWSCognitoSource and updates it. Returns the server's representation of the aWSCognitoSource, and an error, if there is any.
-func (c *aWSCognitoSources) Update(aWSCognitoSource *v1alpha1.AWSCognitoSource) (result *v1alpha1.AWSCognitoSource, err error) {
-	result = &v1alpha1.AWSCognitoSource{}
-	err = c.client.Put().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		Name(aWSCognitoSource.Name).
-		Body(aWSCognitoSource).
-		Do().
-		Into(result)
-	return
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-
-func (c *aWSCognitoSources) UpdateStatus(aWSCognitoSource *v1alpha1.AWSCognitoSource) (result *v1alpha1.AWSCognitoSource, err error) {
-	result = &v1alpha1.AWSCognitoSource{}
-	err = c.client.Put().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		Name(aWSCognitoSource.Name).
-		SubResource("status").
-		Body(aWSCognitoSource).
-		Do().
-		Into(result)
-	return
-}
-
-// Delete takes name of the aWSCognitoSource and deletes it. Returns an error if one occurs.
-func (c *aWSCognitoSources) Delete(name string, options *v1.DeleteOptions) error {
-	return c.client.Delete().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		Name(name).
-		Body(options).
-		Do().
-		Error()
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *aWSCognitoSources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
-	var timeout time.Duration
-	if listOptions.TimeoutSeconds != nil {
-		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
-	}
-	return c.client.Delete().
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		VersionedParams(&listOptions, scheme.ParameterCodec).
-		Timeout(timeout).
-		Body(options).
-		Do().
-		Error()
-}
-
-// Patch applies the patch and returns the patched aWSCognitoSource.
-func (c *aWSCognitoSources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoSource, err error) {
-	result = &v1alpha1.AWSCognitoSource{}
-	err = c.client.Patch(pt).
-		Namespace(c.ns).
-		Resource("awscognitosources").
-		SubResource(subresources...).
-		Name(name).
-		Body(data).
-		Do().
-		Into(result)
-	return
-}
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitoidentitysource.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitoidentitysource.go
new file mode 100644
index 0000000..a919e87
--- /dev/null
+++ b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitoidentitysource.go
@@ -0,0 +1,140 @@
+/*
+Copyright (c) 2020 TriggerMesh Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	testing "k8s.io/client-go/testing"
+)
+
+// FakeAWSCognitoIdentitySources implements AWSCognitoIdentitySourceInterface
+type FakeAWSCognitoIdentitySources struct {
+	Fake *FakeSourcesV1alpha1
+	ns   string
+}
+
+var awscognitoidentitysourcesResource = schema.GroupVersionResource{Group: "sources.triggermesh.io", Version: "v1alpha1", Resource: "awscognitoidentitysources"}
+
+var awscognitoidentitysourcesKind = schema.GroupVersionKind{Group: "sources.triggermesh.io", Version: "v1alpha1", Kind: "AWSCognitoIdentitySource"}
+
+// Get takes name of the aWSCognitoIdentitySource, and returns the corresponding aWSCognitoIdentitySource object, and an error if there is any.
+func (c *FakeAWSCognitoIdentitySources) Get(name string, options v1.GetOptions) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewGetAction(awscognitoidentitysourcesResource, c.ns, name), &v1alpha1.AWSCognitoIdentitySource{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), err
+}
+
+// List takes label and field selectors, and returns the list of AWSCognitoIdentitySources that match those selectors.
+func (c *FakeAWSCognitoIdentitySources) List(opts v1.ListOptions) (result *v1alpha1.AWSCognitoIdentitySourceList, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewListAction(awscognitoidentitysourcesResource, awscognitoidentitysourcesKind, c.ns, opts), &v1alpha1.AWSCognitoIdentitySourceList{})
+
+	if obj == nil {
+		return nil, err
+	}
+
+	label, _, _ := testing.ExtractFromListOptions(opts)
+	if label == nil {
+		label = labels.Everything()
+	}
+	list := &v1alpha1.AWSCognitoIdentitySourceList{ListMeta: obj.(*v1alpha1.AWSCognitoIdentitySourceList).ListMeta}
+	for _, item := range obj.(*v1alpha1.AWSCognitoIdentitySourceList).Items {
+		if label.Matches(labels.Set(item.Labels)) {
+			list.Items = append(list.Items, item)
+		}
+	}
+	return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested aWSCognitoIdentitySources.
+func (c *FakeAWSCognitoIdentitySources) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	return c.Fake.
+		InvokesWatch(testing.NewWatchAction(awscognitoidentitysourcesResource, c.ns, opts))
+
+}
+
+// Create takes the representation of a aWSCognitoIdentitySource and creates it.  Returns the server's representation of the aWSCognitoIdentitySource, and an error, if there is any.
+func (c *FakeAWSCognitoIdentitySources) Create(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewCreateAction(awscognitoidentitysourcesResource, c.ns, aWSCognitoIdentitySource), &v1alpha1.AWSCognitoIdentitySource{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), err
+}
+
+// Update takes the representation of a aWSCognitoIdentitySource and updates it. Returns the server's representation of the aWSCognitoIdentitySource, and an error, if there is any.
+func (c *FakeAWSCognitoIdentitySources) Update(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateAction(awscognitoidentitysourcesResource, c.ns, aWSCognitoIdentitySource), &v1alpha1.AWSCognitoIdentitySource{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), err
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *FakeAWSCognitoIdentitySources) UpdateStatus(aWSCognitoIdentitySource *v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateSubresourceAction(awscognitoidentitysourcesResource, "status", c.ns, aWSCognitoIdentitySource), &v1alpha1.AWSCognitoIdentitySource{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), err
+}
+
+// Delete takes name of the aWSCognitoIdentitySource and deletes it. Returns an error if one occurs.
+func (c *FakeAWSCognitoIdentitySources) Delete(name string, options *v1.DeleteOptions) error {
+	_, err := c.Fake.
+		Invokes(testing.NewDeleteAction(awscognitoidentitysourcesResource, c.ns, name), &v1alpha1.AWSCognitoIdentitySource{})
+
+	return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeAWSCognitoIdentitySources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	action := testing.NewDeleteCollectionAction(awscognitoidentitysourcesResource, c.ns, listOptions)
+
+	_, err := c.Fake.Invokes(action, &v1alpha1.AWSCognitoIdentitySourceList{})
+	return err
+}
+
+// Patch applies the patch and returns the patched aWSCognitoIdentitySource.
+func (c *FakeAWSCognitoIdentitySources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoIdentitySource, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewPatchSubresourceAction(awscognitoidentitysourcesResource, c.ns, name, pt, data, subresources...), &v1alpha1.AWSCognitoIdentitySource{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), err
+}
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitosource.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitosource.go
deleted file mode 100644
index 317532b..0000000
--- a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_awscognitosource.go
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright (c) 2020 TriggerMesh Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by client-gen. DO NOT EDIT.
-
-package fake
-
-import (
-	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	labels "k8s.io/apimachinery/pkg/labels"
-	schema "k8s.io/apimachinery/pkg/runtime/schema"
-	types "k8s.io/apimachinery/pkg/types"
-	watch "k8s.io/apimachinery/pkg/watch"
-	testing "k8s.io/client-go/testing"
-)
-
-// FakeAWSCognitoSources implements AWSCognitoSourceInterface
-type FakeAWSCognitoSources struct {
-	Fake *FakeSourcesV1alpha1
-	ns   string
-}
-
-var awscognitosourcesResource = schema.GroupVersionResource{Group: "sources.triggermesh.io", Version: "v1alpha1", Resource: "awscognitosources"}
-
-var awscognitosourcesKind = schema.GroupVersionKind{Group: "sources.triggermesh.io", Version: "v1alpha1", Kind: "AWSCognitoSource"}
-
-// Get takes name of the aWSCognitoSource, and returns the corresponding aWSCognitoSource object, and an error if there is any.
-func (c *FakeAWSCognitoSources) Get(name string, options v1.GetOptions) (result *v1alpha1.AWSCognitoSource, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewGetAction(awscognitosourcesResource, c.ns, name), &v1alpha1.AWSCognitoSource{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), err
-}
-
-// List takes label and field selectors, and returns the list of AWSCognitoSources that match those selectors.
-func (c *FakeAWSCognitoSources) List(opts v1.ListOptions) (result *v1alpha1.AWSCognitoSourceList, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewListAction(awscognitosourcesResource, awscognitosourcesKind, c.ns, opts), &v1alpha1.AWSCognitoSourceList{})
-
-	if obj == nil {
-		return nil, err
-	}
-
-	label, _, _ := testing.ExtractFromListOptions(opts)
-	if label == nil {
-		label = labels.Everything()
-	}
-	list := &v1alpha1.AWSCognitoSourceList{ListMeta: obj.(*v1alpha1.AWSCognitoSourceList).ListMeta}
-	for _, item := range obj.(*v1alpha1.AWSCognitoSourceList).Items {
-		if label.Matches(labels.Set(item.Labels)) {
-			list.Items = append(list.Items, item)
-		}
-	}
-	return list, err
-}
-
-// Watch returns a watch.Interface that watches the requested aWSCognitoSources.
-func (c *FakeAWSCognitoSources) Watch(opts v1.ListOptions) (watch.Interface, error) {
-	return c.Fake.
-		InvokesWatch(testing.NewWatchAction(awscognitosourcesResource, c.ns, opts))
-
-}
-
-// Create takes the representation of a aWSCognitoSource and creates it.  Returns the server's representation of the aWSCognitoSource, and an error, if there is any.
-func (c *FakeAWSCognitoSources) Create(aWSCognitoSource *v1alpha1.AWSCognitoSource) (result *v1alpha1.AWSCognitoSource, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewCreateAction(awscognitosourcesResource, c.ns, aWSCognitoSource), &v1alpha1.AWSCognitoSource{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), err
-}
-
-// Update takes the representation of a aWSCognitoSource and updates it. Returns the server's representation of the aWSCognitoSource, and an error, if there is any.
-func (c *FakeAWSCognitoSources) Update(aWSCognitoSource *v1alpha1.AWSCognitoSource) (result *v1alpha1.AWSCognitoSource, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateAction(awscognitosourcesResource, c.ns, aWSCognitoSource), &v1alpha1.AWSCognitoSource{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), err
-}
-
-// UpdateStatus was generated because the type contains a Status member.
-// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
-func (c *FakeAWSCognitoSources) UpdateStatus(aWSCognitoSource *v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceAction(awscognitosourcesResource, "status", c.ns, aWSCognitoSource), &v1alpha1.AWSCognitoSource{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), err
-}
-
-// Delete takes name of the aWSCognitoSource and deletes it. Returns an error if one occurs.
-func (c *FakeAWSCognitoSources) Delete(name string, options *v1.DeleteOptions) error {
-	_, err := c.Fake.
-		Invokes(testing.NewDeleteAction(awscognitosourcesResource, c.ns, name), &v1alpha1.AWSCognitoSource{})
-
-	return err
-}
-
-// DeleteCollection deletes a collection of objects.
-func (c *FakeAWSCognitoSources) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
-	action := testing.NewDeleteCollectionAction(awscognitosourcesResource, c.ns, listOptions)
-
-	_, err := c.Fake.Invokes(action, &v1alpha1.AWSCognitoSourceList{})
-	return err
-}
-
-// Patch applies the patch and returns the patched aWSCognitoSource.
-func (c *FakeAWSCognitoSources) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.AWSCognitoSource, err error) {
-	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceAction(awscognitosourcesResource, c.ns, name, pt, data, subresources...), &v1alpha1.AWSCognitoSource{})
-
-	if obj == nil {
-		return nil, err
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), err
-}
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_sources_client.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_sources_client.go
index 491f9b8..9d425b8 100644
--- a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_sources_client.go
+++ b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/fake/fake_sources_client.go
@@ -32,8 +32,8 @@ func (c *FakeSourcesV1alpha1) AWSCodeCommitSources(namespace string) v1alpha1.AW
 	return &FakeAWSCodeCommitSources{c, namespace}
 }
 
-func (c *FakeSourcesV1alpha1) AWSCognitoSources(namespace string) v1alpha1.AWSCognitoSourceInterface {
-	return &FakeAWSCognitoSources{c, namespace}
+func (c *FakeSourcesV1alpha1) AWSCognitoIdentitySources(namespace string) v1alpha1.AWSCognitoIdentitySourceInterface {
+	return &FakeAWSCognitoIdentitySources{c, namespace}
 }
 
 func (c *FakeSourcesV1alpha1) AWSCognitoUserPoolSources(namespace string) v1alpha1.AWSCognitoUserPoolSourceInterface {
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/generated_expansion.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/generated_expansion.go
index 5a64a79..abdbbed 100644
--- a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/generated_expansion.go
+++ b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/generated_expansion.go
@@ -20,7 +20,7 @@ package v1alpha1
 
 type AWSCodeCommitSourceExpansion interface{}
 
-type AWSCognitoSourceExpansion interface{}
+type AWSCognitoIdentitySourceExpansion interface{}
 
 type AWSCognitoUserPoolSourceExpansion interface{}
 
diff --git a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/sources_client.go b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/sources_client.go
index b76cfaf..2cdf125 100644
--- a/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/sources_client.go
+++ b/pkg/client/generated/clientset/internalclientset/typed/sources/v1alpha1/sources_client.go
@@ -27,7 +27,7 @@ import (
 type SourcesV1alpha1Interface interface {
 	RESTClient() rest.Interface
 	AWSCodeCommitSourcesGetter
-	AWSCognitoSourcesGetter
+	AWSCognitoIdentitySourcesGetter
 	AWSCognitoUserPoolSourcesGetter
 	AWSDynamoDBSourcesGetter
 	AWSIoTSourcesGetter
@@ -45,8 +45,8 @@ func (c *SourcesV1alpha1Client) AWSCodeCommitSources(namespace string) AWSCodeCo
 	return newAWSCodeCommitSources(c, namespace)
 }
 
-func (c *SourcesV1alpha1Client) AWSCognitoSources(namespace string) AWSCognitoSourceInterface {
-	return newAWSCognitoSources(c, namespace)
+func (c *SourcesV1alpha1Client) AWSCognitoIdentitySources(namespace string) AWSCognitoIdentitySourceInterface {
+	return newAWSCognitoIdentitySources(c, namespace)
 }
 
 func (c *SourcesV1alpha1Client) AWSCognitoUserPoolSources(namespace string) AWSCognitoUserPoolSourceInterface {
diff --git a/pkg/client/generated/informers/externalversions/generic.go b/pkg/client/generated/informers/externalversions/generic.go
index 55bc108..0aac397 100644
--- a/pkg/client/generated/informers/externalversions/generic.go
+++ b/pkg/client/generated/informers/externalversions/generic.go
@@ -55,8 +55,8 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	// Group=sources.triggermesh.io, Version=v1alpha1
 	case v1alpha1.SchemeGroupVersion.WithResource("awscodecommitsources"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1alpha1().AWSCodeCommitSources().Informer()}, nil
-	case v1alpha1.SchemeGroupVersion.WithResource("awscognitosources"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1alpha1().AWSCognitoSources().Informer()}, nil
+	case v1alpha1.SchemeGroupVersion.WithResource("awscognitoidentitysources"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1alpha1().AWSCognitoIdentitySources().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("awscognitouserpoolsources"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Sources().V1alpha1().AWSCognitoUserPoolSources().Informer()}, nil
 	case v1alpha1.SchemeGroupVersion.WithResource("awsdynamodbsources"):
diff --git a/pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitosource.go b/pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitoidentitysource.go
similarity index 55%
rename from pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitosource.go
rename to pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitoidentitysource.go
index 9c7f825..b2668d8 100644
--- a/pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitosource.go
+++ b/pkg/client/generated/informers/externalversions/sources/v1alpha1/awscognitoidentitysource.go
@@ -31,59 +31,59 @@ import (
 	cache "k8s.io/client-go/tools/cache"
 )
 
-// AWSCognitoSourceInformer provides access to a shared informer and lister for
-// AWSCognitoSources.
-type AWSCognitoSourceInformer interface {
+// AWSCognitoIdentitySourceInformer provides access to a shared informer and lister for
+// AWSCognitoIdentitySources.
+type AWSCognitoIdentitySourceInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v1alpha1.AWSCognitoSourceLister
+	Lister() v1alpha1.AWSCognitoIdentitySourceLister
 }
 
-type aWSCognitoSourceInformer struct {
+type aWSCognitoIdentitySourceInformer struct {
 	factory          internalinterfaces.SharedInformerFactory
 	tweakListOptions internalinterfaces.TweakListOptionsFunc
 	namespace        string
 }
 
-// NewAWSCognitoSourceInformer constructs a new informer for AWSCognitoSource type.
+// NewAWSCognitoIdentitySourceInformer constructs a new informer for AWSCognitoIdentitySource type.
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
-func NewAWSCognitoSourceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
-	return NewFilteredAWSCognitoSourceInformer(client, namespace, resyncPeriod, indexers, nil)
+func NewAWSCognitoIdentitySourceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return NewFilteredAWSCognitoIdentitySourceInformer(client, namespace, resyncPeriod, indexers, nil)
 }
 
-// NewFilteredAWSCognitoSourceInformer constructs a new informer for AWSCognitoSource type.
+// NewFilteredAWSCognitoIdentitySourceInformer constructs a new informer for AWSCognitoIdentitySource type.
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
-func NewFilteredAWSCognitoSourceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+func NewFilteredAWSCognitoIdentitySourceInformer(client internalclientset.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
 	return cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.SourcesV1alpha1().AWSCognitoSources(namespace).List(options)
+				return client.SourcesV1alpha1().AWSCognitoIdentitySources(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.SourcesV1alpha1().AWSCognitoSources(namespace).Watch(options)
+				return client.SourcesV1alpha1().AWSCognitoIdentitySources(namespace).Watch(options)
 			},
 		},
-		&sourcesv1alpha1.AWSCognitoSource{},
+		&sourcesv1alpha1.AWSCognitoIdentitySource{},
 		resyncPeriod,
 		indexers,
 	)
 }
 
-func (f *aWSCognitoSourceInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
-	return NewFilteredAWSCognitoSourceInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+func (f *aWSCognitoIdentitySourceInformer) defaultInformer(client internalclientset.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewFilteredAWSCognitoIdentitySourceInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
 }
 
-func (f *aWSCognitoSourceInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&sourcesv1alpha1.AWSCognitoSource{}, f.defaultInformer)
+func (f *aWSCognitoIdentitySourceInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&sourcesv1alpha1.AWSCognitoIdentitySource{}, f.defaultInformer)
 }
 
-func (f *aWSCognitoSourceInformer) Lister() v1alpha1.AWSCognitoSourceLister {
-	return v1alpha1.NewAWSCognitoSourceLister(f.Informer().GetIndexer())
+func (f *aWSCognitoIdentitySourceInformer) Lister() v1alpha1.AWSCognitoIdentitySourceLister {
+	return v1alpha1.NewAWSCognitoIdentitySourceLister(f.Informer().GetIndexer())
 }
diff --git a/pkg/client/generated/informers/externalversions/sources/v1alpha1/interface.go b/pkg/client/generated/informers/externalversions/sources/v1alpha1/interface.go
index 75d9eb3..c7f23d1 100644
--- a/pkg/client/generated/informers/externalversions/sources/v1alpha1/interface.go
+++ b/pkg/client/generated/informers/externalversions/sources/v1alpha1/interface.go
@@ -26,8 +26,8 @@ import (
 type Interface interface {
 	// AWSCodeCommitSources returns a AWSCodeCommitSourceInformer.
 	AWSCodeCommitSources() AWSCodeCommitSourceInformer
-	// AWSCognitoSources returns a AWSCognitoSourceInformer.
-	AWSCognitoSources() AWSCognitoSourceInformer
+	// AWSCognitoIdentitySources returns a AWSCognitoIdentitySourceInformer.
+	AWSCognitoIdentitySources() AWSCognitoIdentitySourceInformer
 	// AWSCognitoUserPoolSources returns a AWSCognitoUserPoolSourceInformer.
 	AWSCognitoUserPoolSources() AWSCognitoUserPoolSourceInformer
 	// AWSDynamoDBSources returns a AWSDynamoDBSourceInformer.
@@ -58,9 +58,9 @@ func (v *version) AWSCodeCommitSources() AWSCodeCommitSourceInformer {
 	return &aWSCodeCommitSourceInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
 }
 
-// AWSCognitoSources returns a AWSCognitoSourceInformer.
-func (v *version) AWSCognitoSources() AWSCognitoSourceInformer {
-	return &aWSCognitoSourceInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
+// AWSCognitoIdentitySources returns a AWSCognitoIdentitySourceInformer.
+func (v *version) AWSCognitoIdentitySources() AWSCognitoIdentitySourceInformer {
+	return &aWSCognitoIdentitySourceInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
 }
 
 // AWSCognitoUserPoolSources returns a AWSCognitoUserPoolSourceInformer.
diff --git a/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/awscognitosource.go b/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/awscognitoidentitysource.go
similarity index 85%
rename from pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/awscognitosource.go
rename to pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/awscognitoidentitysource.go
index 517a9a5..c150bb0 100644
--- a/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/awscognitosource.go
+++ b/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/awscognitoidentitysource.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Code generated by injection-gen. DO NOT EDIT.
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	context "context"
@@ -37,16 +37,16 @@ type Key struct{}
 
 func withInformer(ctx context.Context) (context.Context, controller.Informer) {
 	f := factory.Get(ctx)
-	inf := f.Sources().V1alpha1().AWSCognitoSources()
+	inf := f.Sources().V1alpha1().AWSCognitoIdentitySources()
 	return context.WithValue(ctx, Key{}, inf), inf.Informer()
 }
 
 // Get extracts the typed informer from the context.
-func Get(ctx context.Context) v1alpha1.AWSCognitoSourceInformer {
+func Get(ctx context.Context) v1alpha1.AWSCognitoIdentitySourceInformer {
 	untyped := ctx.Value(Key{})
 	if untyped == nil {
 		logging.FromContext(ctx).Panic(
-			"Unable to fetch github.com/triggermesh/aws-event-sources/pkg/client/generated/informers/externalversions/sources/v1alpha1.AWSCognitoSourceInformer from context.")
+			"Unable to fetch github.com/triggermesh/aws-event-sources/pkg/client/generated/informers/externalversions/sources/v1alpha1.AWSCognitoIdentitySourceInformer from context.")
 	}
-	return untyped.(v1alpha1.AWSCognitoSourceInformer)
+	return untyped.(v1alpha1.AWSCognitoIdentitySourceInformer)
 }
diff --git a/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/fake/fake.go b/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/fake/fake.go
similarity index 75%
rename from pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/fake/fake.go
rename to pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/fake/fake.go
index 4d139bc..46a9ca6 100644
--- a/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/fake/fake.go
+++ b/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/fake/fake.go
@@ -22,12 +22,12 @@ import (
 	context "context"
 
 	fake "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/factory/fake"
-	awscognitosource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource"
+	awscognitoidentitysource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource"
 	controller "knative.dev/pkg/controller"
 	injection "knative.dev/pkg/injection"
 )
 
-var Get = awscognitosource.Get
+var Get = awscognitoidentitysource.Get
 
 func init() {
 	injection.Fake.RegisterInformer(withInformer)
@@ -35,6 +35,6 @@ func init() {
 
 func withInformer(ctx context.Context) (context.Context, controller.Informer) {
 	f := fake.Get(ctx)
-	inf := f.Sources().V1alpha1().AWSCognitoSources()
-	return context.WithValue(ctx, awscognitosource.Key{}, inf), inf.Informer()
+	inf := f.Sources().V1alpha1().AWSCognitoIdentitySources()
+	return context.WithValue(ctx, awscognitoidentitysource.Key{}, inf), inf.Informer()
 }
diff --git a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/controller.go b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/controller.go
similarity index 88%
rename from pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/controller.go
rename to pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/controller.go
index 8c6686b..7710a07 100644
--- a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/controller.go
+++ b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/controller.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Code generated by injection-gen. DO NOT EDIT.
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	context "context"
@@ -26,7 +26,7 @@ import (
 
 	internalclientsetscheme "github.com/triggermesh/aws-event-sources/pkg/client/generated/clientset/internalclientset/scheme"
 	client "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/client"
-	awscognitosource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource"
+	awscognitoidentitysource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource"
 	corev1 "k8s.io/api/core/v1"
 	watch "k8s.io/apimachinery/pkg/watch"
 	scheme "k8s.io/client-go/kubernetes/scheme"
@@ -38,8 +38,8 @@ import (
 )
 
 const (
-	defaultControllerAgentName = "awscognitosource-controller"
-	defaultFinalizerName       = "awscognitosources.sources.triggermesh.io"
+	defaultControllerAgentName = "awscognitoidentitysource-controller"
+	defaultFinalizerName       = "awscognitoidentitysources.sources.triggermesh.io"
 )
 
 // NewImpl returns a controller.Impl that handles queuing and feeding work from
@@ -54,11 +54,11 @@ func NewImpl(ctx context.Context, r Interface, optionsFns ...controller.OptionsF
 		logger.Fatalf("up to one options function is supported, found %d", len(optionsFns))
 	}
 
-	awscognitosourceInformer := awscognitosource.Get(ctx)
+	awscognitoidentitysourceInformer := awscognitoidentitysource.Get(ctx)
 
 	rec := &reconcilerImpl{
 		Client:        client.Get(ctx),
-		Lister:        awscognitosourceInformer.Lister(),
+		Lister:        awscognitoidentitysourceInformer.Lister(),
 		reconciler:    r,
 		finalizerName: defaultFinalizerName,
 	}
diff --git a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/reconciler.go b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/reconciler.go
similarity index 88%
rename from pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/reconciler.go
rename to pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/reconciler.go
index ff55b82..a657e0e 100644
--- a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/reconciler.go
+++ b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/reconciler.go
@@ -16,7 +16,7 @@ limitations under the License.
 
 // Code generated by injection-gen. DO NOT EDIT.
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	context "context"
@@ -41,35 +41,35 @@ import (
 )
 
 // Interface defines the strongly typed interfaces to be implemented by a
-// controller reconciling v1alpha1.AWSCognitoSource.
+// controller reconciling v1alpha1.AWSCognitoIdentitySource.
 type Interface interface {
-	// ReconcileKind implements custom logic to reconcile v1alpha1.AWSCognitoSource. Any changes
+	// ReconcileKind implements custom logic to reconcile v1alpha1.AWSCognitoIdentitySource. Any changes
 	// to the objects .Status or .Finalizers will be propagated to the stored
 	// object. It is recommended that implementors do not call any update calls
 	// for the Kind inside of ReconcileKind, it is the responsibility of the calling
 	// controller to propagate those properties. The resource passed to ReconcileKind
 	// will always have an empty deletion timestamp.
-	ReconcileKind(ctx context.Context, o *v1alpha1.AWSCognitoSource) reconciler.Event
+	ReconcileKind(ctx context.Context, o *v1alpha1.AWSCognitoIdentitySource) reconciler.Event
 }
 
 // Finalizer defines the strongly typed interfaces to be implemented by a
-// controller finalizing v1alpha1.AWSCognitoSource.
+// controller finalizing v1alpha1.AWSCognitoIdentitySource.
 type Finalizer interface {
-	// FinalizeKind implements custom logic to finalize v1alpha1.AWSCognitoSource. Any changes
+	// FinalizeKind implements custom logic to finalize v1alpha1.AWSCognitoIdentitySource. Any changes
 	// to the objects .Status or .Finalizers will be ignored. Returning a nil or
 	// Normal type reconciler.Event will allow the finalizer to be deleted on
 	// the resource. The resource passed to FinalizeKind will always have a set
 	// deletion timestamp.
-	FinalizeKind(ctx context.Context, o *v1alpha1.AWSCognitoSource) reconciler.Event
+	FinalizeKind(ctx context.Context, o *v1alpha1.AWSCognitoIdentitySource) reconciler.Event
 }
 
-// reconcilerImpl implements controller.Reconciler for v1alpha1.AWSCognitoSource resources.
+// reconcilerImpl implements controller.Reconciler for v1alpha1.AWSCognitoIdentitySource resources.
 type reconcilerImpl struct {
 	// Client is used to write back status updates.
 	Client internalclientset.Interface
 
 	// Listers index properties about resources
-	Lister sourcesv1alpha1.AWSCognitoSourceLister
+	Lister sourcesv1alpha1.AWSCognitoIdentitySourceLister
 
 	// Recorder is an event recorder for recording Event resources to the
 	// Kubernetes API.
@@ -89,7 +89,7 @@ type reconcilerImpl struct {
 // Check that our Reconciler implements controller.Reconciler
 var _ controller.Reconciler = (*reconcilerImpl)(nil)
 
-func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client internalclientset.Interface, lister sourcesv1alpha1.AWSCognitoSourceLister, recorder record.EventRecorder, r Interface, options ...controller.Options) controller.Reconciler {
+func NewReconciler(ctx context.Context, logger *zap.SugaredLogger, client internalclientset.Interface, lister sourcesv1alpha1.AWSCognitoIdentitySourceLister, recorder record.EventRecorder, r Interface, options ...controller.Options) controller.Reconciler {
 	// Check the options function input. It should be 0 or 1.
 	if len(options) > 1 {
 		logger.Fatalf("up to one options struct is supported, found %d", len(options))
@@ -138,7 +138,7 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
 
 	// Get the resource with this namespace/name.
 
-	getter := r.Lister.AWSCognitoSources(namespace)
+	getter := r.Lister.AWSCognitoIdentitySources(namespace)
 
 	original, err := getter.Get(name)
 
@@ -215,13 +215,13 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
 	return nil
 }
 
-func (r *reconcilerImpl) updateStatus(existing *v1alpha1.AWSCognitoSource, desired *v1alpha1.AWSCognitoSource) error {
+func (r *reconcilerImpl) updateStatus(existing *v1alpha1.AWSCognitoIdentitySource, desired *v1alpha1.AWSCognitoIdentitySource) error {
 	existing = existing.DeepCopy()
 	return reconciler.RetryUpdateConflicts(func(attempts int) (err error) {
 		// The first iteration tries to use the injectionInformer's state, subsequent attempts fetch the latest state via API.
 		if attempts > 0 {
 
-			getter := r.Client.SourcesV1alpha1().AWSCognitoSources(desired.Namespace)
+			getter := r.Client.SourcesV1alpha1().AWSCognitoIdentitySources(desired.Namespace)
 
 			existing, err = getter.Get(desired.Name, metav1.GetOptions{})
 			if err != nil {
@@ -236,7 +236,7 @@ func (r *reconcilerImpl) updateStatus(existing *v1alpha1.AWSCognitoSource, desir
 
 		existing.Status = desired.Status
 
-		updater := r.Client.SourcesV1alpha1().AWSCognitoSources(existing.Namespace)
+		updater := r.Client.SourcesV1alpha1().AWSCognitoIdentitySources(existing.Namespace)
 
 		_, err = updater.UpdateStatus(existing)
 		return err
@@ -246,9 +246,9 @@ func (r *reconcilerImpl) updateStatus(existing *v1alpha1.AWSCognitoSource, desir
 // updateFinalizersFiltered will update the Finalizers of the resource.
 // TODO: this method could be generic and sync all finalizers. For now it only
 // updates defaultFinalizerName or its override.
-func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error) {
+func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error) {
 
-	getter := r.Lister.AWSCognitoSources(resource.Namespace)
+	getter := r.Lister.AWSCognitoIdentitySources(resource.Namespace)
 
 	actual, err := getter.Get(resource.Name)
 	if err != nil {
@@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
 		return resource, err
 	}
 
-	patcher := r.Client.SourcesV1alpha1().AWSCognitoSources(resource.Namespace)
+	patcher := r.Client.SourcesV1alpha1().AWSCognitoIdentitySources(resource.Namespace)
 
 	resource, err = patcher.Patch(resource.Name, types.MergePatchType, patch)
 	if err != nil {
@@ -306,7 +306,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
 	return resource, err
 }
 
-func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *v1alpha1.AWSCognitoSource) (*v1alpha1.AWSCognitoSource, error) {
+func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *v1alpha1.AWSCognitoIdentitySource) (*v1alpha1.AWSCognitoIdentitySource, error) {
 	if _, ok := r.reconciler.(Finalizer); !ok {
 		return resource, nil
 	}
@@ -324,7 +324,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
 	return r.updateFinalizersFiltered(ctx, resource)
 }
 
-func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1alpha1.AWSCognitoSource, reconcileEvent reconciler.Event) (*v1alpha1.AWSCognitoSource, error) {
+func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1alpha1.AWSCognitoIdentitySource, reconcileEvent reconciler.Event) (*v1alpha1.AWSCognitoIdentitySource, error) {
 	if _, ok := r.reconciler.(Finalizer); !ok {
 		return resource, nil
 	}
diff --git a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/controller.go b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/controller.go
similarity index 62%
rename from pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/controller.go
rename to pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/controller.go
index 758e494..5617acb 100644
--- a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/controller.go
+++ b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/controller.go
@@ -16,13 +16,13 @@ limitations under the License.
 
 // Code generated by injection-gen. DO NOT EDIT.
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	context "context"
 
-	awscognitosource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource"
-	v1alpha1awscognitosource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource"
+	awscognitoidentitysource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource"
+	v1alpha1awscognitoidentitysource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource"
 	configmap "knative.dev/pkg/configmap"
 	controller "knative.dev/pkg/controller"
 	logging "knative.dev/pkg/logging"
@@ -30,23 +30,23 @@ import (
 
 // TODO: PLEASE COPY AND MODIFY THIS FILE AS A STARTING POINT
 
-// NewController creates a Reconciler for AWSCognitoSource and returns the result of NewImpl.
+// NewController creates a Reconciler for AWSCognitoIdentitySource and returns the result of NewImpl.
 func NewController(
 	ctx context.Context,
 	cmw configmap.Watcher,
 ) *controller.Impl {
 	logger := logging.FromContext(ctx)
 
-	awscognitosourceInformer := awscognitosource.Get(ctx)
+	awscognitoidentitysourceInformer := awscognitoidentitysource.Get(ctx)
 
 	// TODO: setup additional informers here.
 
 	r := &Reconciler{}
-	impl := v1alpha1awscognitosource.NewImpl(ctx, r)
+	impl := v1alpha1awscognitoidentitysource.NewImpl(ctx, r)
 
 	logger.Info("Setting up event handlers.")
 
-	awscognitosourceInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
+	awscognitoidentitysourceInformer.Informer().AddEventHandler(controller.HandleAll(impl.Enqueue))
 
 	// TODO: add additional informer event handlers here.
 
diff --git a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/reconciler.go b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/reconciler.go
similarity index 72%
rename from pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/reconciler.go
rename to pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/reconciler.go
index 81b013a..5adee6b 100644
--- a/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource/stub/reconciler.go
+++ b/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource/stub/reconciler.go
@@ -16,13 +16,13 @@ limitations under the License.
 
 // Code generated by injection-gen. DO NOT EDIT.
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	context "context"
 
 	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	awscognitosource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource"
+	awscognitoidentitysource "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource"
 	v1 "k8s.io/api/core/v1"
 	reconciler "knative.dev/pkg/reconciler"
 )
@@ -30,24 +30,24 @@ import (
 // TODO: PLEASE COPY AND MODIFY THIS FILE AS A STARTING POINT
 
 // newReconciledNormal makes a new reconciler event with event type Normal, and
-// reason AWSCognitoSourceReconciled.
+// reason AWSCognitoIdentitySourceReconciled.
 func newReconciledNormal(namespace, name string) reconciler.Event {
-	return reconciler.NewEvent(v1.EventTypeNormal, "AWSCognitoSourceReconciled", "AWSCognitoSource reconciled: \"%s/%s\"", namespace, name)
+	return reconciler.NewEvent(v1.EventTypeNormal, "AWSCognitoIdentitySourceReconciled", "AWSCognitoIdentitySource reconciled: \"%s/%s\"", namespace, name)
 }
 
-// Reconciler implements controller.Reconciler for AWSCognitoSource resources.
+// Reconciler implements controller.Reconciler for AWSCognitoIdentitySource resources.
 type Reconciler struct {
 	// TODO: add additional requirements here.
 }
 
 // Check that our Reconciler implements Interface
-var _ awscognitosource.Interface = (*Reconciler)(nil)
+var _ awscognitoidentitysource.Interface = (*Reconciler)(nil)
 
 // Optionally check that our Reconciler implements Finalizer
-//var _ awscognitosource.Finalizer = (*Reconciler)(nil)
+//var _ awscognitoidentitysource.Finalizer = (*Reconciler)(nil)
 
 // ReconcileKind implements Interface.ReconcileKind.
-func (r *Reconciler) ReconcileKind(ctx context.Context, o *v1alpha1.AWSCognitoSource) reconciler.Event {
+func (r *Reconciler) ReconcileKind(ctx context.Context, o *v1alpha1.AWSCognitoIdentitySource) reconciler.Event {
 	// TODO: use this if the resource implements InitializeConditions.
 	// o.Status.InitializeConditions()
 
@@ -60,7 +60,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, o *v1alpha1.AWSCognitoSo
 
 // Optionally, use FinalizeKind to add finalizers. FinalizeKind will be called
 // when the resource is deleted.
-//func (r *Reconciler) FinalizeKind(ctx context.Context, o *v1alpha1.AWSCognitoSource) reconciler.Event {
+//func (r *Reconciler) FinalizeKind(ctx context.Context, o *v1alpha1.AWSCognitoIdentitySource) reconciler.Event {
 //	// TODO: add custom finalization logic here.
 //	return nil
 //}
diff --git a/pkg/client/generated/listers/sources/v1alpha1/awscognitoidentitysource.go b/pkg/client/generated/listers/sources/v1alpha1/awscognitoidentitysource.go
new file mode 100644
index 0000000..2a8bf3c
--- /dev/null
+++ b/pkg/client/generated/listers/sources/v1alpha1/awscognitoidentitysource.go
@@ -0,0 +1,94 @@
+/*
+Copyright (c) 2020 TriggerMesh Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/tools/cache"
+)
+
+// AWSCognitoIdentitySourceLister helps list AWSCognitoIdentitySources.
+type AWSCognitoIdentitySourceLister interface {
+	// List lists all AWSCognitoIdentitySources in the indexer.
+	List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoIdentitySource, err error)
+	// AWSCognitoIdentitySources returns an object that can list and get AWSCognitoIdentitySources.
+	AWSCognitoIdentitySources(namespace string) AWSCognitoIdentitySourceNamespaceLister
+	AWSCognitoIdentitySourceListerExpansion
+}
+
+// aWSCognitoIdentitySourceLister implements the AWSCognitoIdentitySourceLister interface.
+type aWSCognitoIdentitySourceLister struct {
+	indexer cache.Indexer
+}
+
+// NewAWSCognitoIdentitySourceLister returns a new AWSCognitoIdentitySourceLister.
+func NewAWSCognitoIdentitySourceLister(indexer cache.Indexer) AWSCognitoIdentitySourceLister {
+	return &aWSCognitoIdentitySourceLister{indexer: indexer}
+}
+
+// List lists all AWSCognitoIdentitySources in the indexer.
+func (s *aWSCognitoIdentitySourceLister) List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoIdentitySource, err error) {
+	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
+		ret = append(ret, m.(*v1alpha1.AWSCognitoIdentitySource))
+	})
+	return ret, err
+}
+
+// AWSCognitoIdentitySources returns an object that can list and get AWSCognitoIdentitySources.
+func (s *aWSCognitoIdentitySourceLister) AWSCognitoIdentitySources(namespace string) AWSCognitoIdentitySourceNamespaceLister {
+	return aWSCognitoIdentitySourceNamespaceLister{indexer: s.indexer, namespace: namespace}
+}
+
+// AWSCognitoIdentitySourceNamespaceLister helps list and get AWSCognitoIdentitySources.
+type AWSCognitoIdentitySourceNamespaceLister interface {
+	// List lists all AWSCognitoIdentitySources in the indexer for a given namespace.
+	List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoIdentitySource, err error)
+	// Get retrieves the AWSCognitoIdentitySource from the indexer for a given namespace and name.
+	Get(name string) (*v1alpha1.AWSCognitoIdentitySource, error)
+	AWSCognitoIdentitySourceNamespaceListerExpansion
+}
+
+// aWSCognitoIdentitySourceNamespaceLister implements the AWSCognitoIdentitySourceNamespaceLister
+// interface.
+type aWSCognitoIdentitySourceNamespaceLister struct {
+	indexer   cache.Indexer
+	namespace string
+}
+
+// List lists all AWSCognitoIdentitySources in the indexer for a given namespace.
+func (s aWSCognitoIdentitySourceNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoIdentitySource, err error) {
+	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
+		ret = append(ret, m.(*v1alpha1.AWSCognitoIdentitySource))
+	})
+	return ret, err
+}
+
+// Get retrieves the AWSCognitoIdentitySource from the indexer for a given namespace and name.
+func (s aWSCognitoIdentitySourceNamespaceLister) Get(name string) (*v1alpha1.AWSCognitoIdentitySource, error) {
+	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errors.NewNotFound(v1alpha1.Resource("awscognitoidentitysource"), name)
+	}
+	return obj.(*v1alpha1.AWSCognitoIdentitySource), nil
+}
diff --git a/pkg/client/generated/listers/sources/v1alpha1/awscognitosource.go b/pkg/client/generated/listers/sources/v1alpha1/awscognitosource.go
deleted file mode 100644
index d39e6c6..0000000
--- a/pkg/client/generated/listers/sources/v1alpha1/awscognitosource.go
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright (c) 2020 TriggerMesh Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by lister-gen. DO NOT EDIT.
-
-package v1alpha1
-
-import (
-	v1alpha1 "github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/client-go/tools/cache"
-)
-
-// AWSCognitoSourceLister helps list AWSCognitoSources.
-type AWSCognitoSourceLister interface {
-	// List lists all AWSCognitoSources in the indexer.
-	List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoSource, err error)
-	// AWSCognitoSources returns an object that can list and get AWSCognitoSources.
-	AWSCognitoSources(namespace string) AWSCognitoSourceNamespaceLister
-	AWSCognitoSourceListerExpansion
-}
-
-// aWSCognitoSourceLister implements the AWSCognitoSourceLister interface.
-type aWSCognitoSourceLister struct {
-	indexer cache.Indexer
-}
-
-// NewAWSCognitoSourceLister returns a new AWSCognitoSourceLister.
-func NewAWSCognitoSourceLister(indexer cache.Indexer) AWSCognitoSourceLister {
-	return &aWSCognitoSourceLister{indexer: indexer}
-}
-
-// List lists all AWSCognitoSources in the indexer.
-func (s *aWSCognitoSourceLister) List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoSource, err error) {
-	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1alpha1.AWSCognitoSource))
-	})
-	return ret, err
-}
-
-// AWSCognitoSources returns an object that can list and get AWSCognitoSources.
-func (s *aWSCognitoSourceLister) AWSCognitoSources(namespace string) AWSCognitoSourceNamespaceLister {
-	return aWSCognitoSourceNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// AWSCognitoSourceNamespaceLister helps list and get AWSCognitoSources.
-type AWSCognitoSourceNamespaceLister interface {
-	// List lists all AWSCognitoSources in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoSource, err error)
-	// Get retrieves the AWSCognitoSource from the indexer for a given namespace and name.
-	Get(name string) (*v1alpha1.AWSCognitoSource, error)
-	AWSCognitoSourceNamespaceListerExpansion
-}
-
-// aWSCognitoSourceNamespaceLister implements the AWSCognitoSourceNamespaceLister
-// interface.
-type aWSCognitoSourceNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all AWSCognitoSources in the indexer for a given namespace.
-func (s aWSCognitoSourceNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.AWSCognitoSource, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1alpha1.AWSCognitoSource))
-	})
-	return ret, err
-}
-
-// Get retrieves the AWSCognitoSource from the indexer for a given namespace and name.
-func (s aWSCognitoSourceNamespaceLister) Get(name string) (*v1alpha1.AWSCognitoSource, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
-	if err != nil {
-		return nil, err
-	}
-	if !exists {
-		return nil, errors.NewNotFound(v1alpha1.Resource("awscognitosource"), name)
-	}
-	return obj.(*v1alpha1.AWSCognitoSource), nil
-}
diff --git a/pkg/client/generated/listers/sources/v1alpha1/expansion_generated.go b/pkg/client/generated/listers/sources/v1alpha1/expansion_generated.go
index e65685d..0e91c42 100644
--- a/pkg/client/generated/listers/sources/v1alpha1/expansion_generated.go
+++ b/pkg/client/generated/listers/sources/v1alpha1/expansion_generated.go
@@ -26,13 +26,13 @@ type AWSCodeCommitSourceListerExpansion interface{}
 // AWSCodeCommitSourceNamespaceLister.
 type AWSCodeCommitSourceNamespaceListerExpansion interface{}
 
-// AWSCognitoSourceListerExpansion allows custom methods to be added to
-// AWSCognitoSourceLister.
-type AWSCognitoSourceListerExpansion interface{}
+// AWSCognitoIdentitySourceListerExpansion allows custom methods to be added to
+// AWSCognitoIdentitySourceLister.
+type AWSCognitoIdentitySourceListerExpansion interface{}
 
-// AWSCognitoSourceNamespaceListerExpansion allows custom methods to be added to
-// AWSCognitoSourceNamespaceLister.
-type AWSCognitoSourceNamespaceListerExpansion interface{}
+// AWSCognitoIdentitySourceNamespaceListerExpansion allows custom methods to be added to
+// AWSCognitoIdentitySourceNamespaceLister.
+type AWSCognitoIdentitySourceNamespaceListerExpansion interface{}
 
 // AWSCognitoUserPoolSourceListerExpansion allows custom methods to be added to
 // AWSCognitoUserPoolSourceLister.
diff --git a/pkg/reconciler/awscognitosource/adapter.go b/pkg/reconciler/awscognitoidentitysource/adapter.go
similarity index 91%
rename from pkg/reconciler/awscognitosource/adapter.go
rename to pkg/reconciler/awscognitoidentitysource/adapter.go
index ae76a7b..0e19387 100644
--- a/pkg/reconciler/awscognitosource/adapter.go
+++ b/pkg/reconciler/awscognitoidentitysource/adapter.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"fmt"
@@ -32,20 +32,20 @@ import (
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/common/resource"
 )
 
-const adapterName = "awscognitosource"
+const adapterName = "awscognitoidentitysource"
 
 // adapterConfig contains properties used to configure the source's adapter.
 // These are automatically populated by envconfig.
 type adapterConfig struct {
 	// Container image
-	Image string `default:"gcr.io/triggermesh/awscognitosource"`
+	Image string `default:"gcr.io/triggermesh/awscognitoidentitysource"`
 	// Configuration accessor for logging/metrics/tracing
 	configs source.ConfigAccessor
 }
 
 // adapterDeploymentBuilder returns an AdapterDeploymentBuilderFunc for the
 // given source object and adapter config.
-func adapterDeploymentBuilder(src *v1alpha1.AWSCognitoSource, cfg *adapterConfig) common.AdapterDeploymentBuilderFunc {
+func adapterDeploymentBuilder(src *v1alpha1.AWSCognitoIdentitySource, cfg *adapterConfig) common.AdapterDeploymentBuilderFunc {
 	return func(arn arn.ARN, sinkURI *apis.URL) *appsv1.Deployment {
 		name := kmeta.ChildName(fmt.Sprintf("%s-", adapterName), src.Name)
 
diff --git a/pkg/reconciler/awscognitosource/controller.go b/pkg/reconciler/awscognitoidentitysource/controller.go
similarity index 93%
rename from pkg/reconciler/awscognitosource/controller.go
rename to pkg/reconciler/awscognitoidentitysource/controller.go
index 6f9c5f4..8351ceb 100644
--- a/pkg/reconciler/awscognitosource/controller.go
+++ b/pkg/reconciler/awscognitoidentitysource/controller.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"context"
@@ -26,8 +26,8 @@ import (
 	"knative.dev/pkg/controller"
 
 	"github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	informerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource"
-	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource"
+	informerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource"
+	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/common"
 )
 
@@ -51,7 +51,7 @@ func NewController(
 
 	r.base = common.NewGenericDeploymentReconciler(
 		ctx,
-		(&v1alpha1.AWSCognitoSource{}).GetGroupVersionKind(),
+		(&v1alpha1.AWSCognitoIdentitySource{}).GetGroupVersionKind(),
 		impl.EnqueueKey,
 		impl.EnqueueControllerOf,
 	)
diff --git a/pkg/reconciler/awscognitosource/reconciler.go b/pkg/reconciler/awscognitoidentitysource/reconciler.go
similarity index 93%
rename from pkg/reconciler/awscognitosource/reconciler.go
rename to pkg/reconciler/awscognitoidentitysource/reconciler.go
index 3fce661..bc4188a 100644
--- a/pkg/reconciler/awscognitosource/reconciler.go
+++ b/pkg/reconciler/awscognitoidentitysource/reconciler.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"context"
@@ -22,7 +22,7 @@ import (
 	"knative.dev/pkg/reconciler"
 
 	"github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
-	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource"
+	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/common"
 )
 
@@ -36,7 +36,7 @@ type Reconciler struct {
 var _ reconcilerv1alpha1.Interface = (*Reconciler)(nil)
 
 // ReconcileKind implements Interface.ReconcileKind.
-func (r *Reconciler) ReconcileKind(ctx context.Context, src *v1alpha1.AWSCognitoSource) reconciler.Event {
+func (r *Reconciler) ReconcileKind(ctx context.Context, src *v1alpha1.AWSCognitoIdentitySource) reconciler.Event {
 	// inject source into context for usage in reconciliation logic
 	ctx = v1alpha1.WithSource(ctx, src)
 


Test patch:
diff --git a/pkg/adapter/awscognitosource/adapter_test.go b/pkg/adapter/awscognitoidentitysource/adapter_test.go
similarity index 99%
rename from pkg/adapter/awscognitosource/adapter_test.go
rename to pkg/adapter/awscognitoidentitysource/adapter_test.go
index 7f895a5..88e0ce0 100644
--- a/pkg/adapter/awscognitosource/adapter_test.go
+++ b/pkg/adapter/awscognitoidentitysource/adapter_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"errors"
diff --git a/pkg/adapter/common/common_test.go b/pkg/adapter/common/common_test.go
index 9a2b1fe..fe1a9b3 100644
--- a/pkg/adapter/common/common_test.go
+++ b/pkg/adapter/common/common_test.go
@@ -120,7 +120,7 @@ func TestMustParseResource(t *testing.T) {
 	}
 }
 
-func TestMustParseCognitoResource(t *testing.T) {
+func TestMustParseCognitoIdentityResource(t *testing.T) {
 	testCases := map[string]struct {
 		input       string
 		expect      string
@@ -141,12 +141,48 @@ func TestMustParseCognitoResource(t *testing.T) {
 		t.Run(name, func(t *testing.T) {
 			var out string
 			var testFn assert.PanicTestFunc = func() {
-				out = MustParseCognitoResource(tc.input)
+				out = MustParseCognitoIdentityResource(tc.input)
 			}
 
 			if tc.expectPanic {
 				assert.PanicsWithError(t,
-					newParseResourceError(expectCognitoResourceFmt, tc.input).Error(), testFn)
+					newParseResourceError(expectCognitoIdentityResourceFmt, tc.input).Error(), testFn)
+			} else {
+				assert.NotPanics(t, testFn)
+			}
+
+			assert.Equal(t, tc.expect, out)
+		})
+	}
+}
+
+func TestMustParseCognitoUserPoolResource(t *testing.T) {
+	testCases := map[string]struct {
+		input       string
+		expect      string
+		expectPanic bool
+	}{
+		"valid input": {
+			input:  "userpool/some-value",
+			expect: "some-value",
+		},
+		"invalid input": {
+			input:       "not-userpool/some-value",
+			expectPanic: true,
+		},
+	}
+
+	for name, tc := range testCases {
+		//nolint:scopelint
+		t.Run(name, func(t *testing.T) {
+			var out string
+			var testFn assert.PanicTestFunc = func() {
+				out = MustParseCognitoUserPoolResource(tc.input)
+			}
+
+			if tc.expectPanic {
+				assert.PanicsWithError(t,
+					newParseResourceError(expectCognitoUserPoolResourceFmt, tc.input).Error(), testFn)
 			} else {
 				assert.NotPanics(t, testFn)
 			}
diff --git a/pkg/reconciler/awscognitosource/controller_test.go b/pkg/reconciler/awscognitoidentitysource/controller_test.go
similarity index 92%
rename from pkg/reconciler/awscognitosource/controller_test.go
rename to pkg/reconciler/awscognitoidentitysource/controller_test.go
index b0ca788..df55393 100644
--- a/pkg/reconciler/awscognitosource/controller_test.go
+++ b/pkg/reconciler/awscognitoidentitysource/controller_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"testing"
@@ -22,7 +22,7 @@ import (
 	. "github.com/triggermesh/aws-event-sources/pkg/reconciler/testing"
 
 	// Link fake informers accessed by our controller
-	_ "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitosource/fake"
+	_ "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/informers/sources/v1alpha1/awscognitoidentitysource/fake"
 	_ "knative.dev/pkg/client/injection/ducks/duck/v1/addressable/fake"
 	_ "knative.dev/pkg/client/injection/kube/informers/apps/v1/deployment/fake"
 	_ "knative.dev/pkg/injection/clients/dynamicclient/fake"
diff --git a/pkg/reconciler/awscognitosource/reconciler_test.go b/pkg/reconciler/awscognitoidentitysource/reconciler_test.go
similarity index 89%
rename from pkg/reconciler/awscognitosource/reconciler_test.go
rename to pkg/reconciler/awscognitoidentitysource/reconciler_test.go
index d2500af..ec76f87 100644
--- a/pkg/reconciler/awscognitosource/reconciler_test.go
+++ b/pkg/reconciler/awscognitoidentitysource/reconciler_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package awscognitosource
+package awscognitoidentitysource
 
 import (
 	"context"
@@ -33,7 +33,7 @@ import (
 
 	"github.com/triggermesh/aws-event-sources/pkg/apis/sources/v1alpha1"
 	fakeinjectionclient "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/client/fake"
-	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitosource"
+	reconcilerv1alpha1 "github.com/triggermesh/aws-event-sources/pkg/client/generated/injection/reconciler/sources/v1alpha1/awscognitoidentitysource"
 	"github.com/triggermesh/aws-event-sources/pkg/reconciler/common"
 	. "github.com/triggermesh/aws-event-sources/pkg/reconciler/testing"
 )
@@ -53,7 +53,7 @@ func TestReconcileSource(t *testing.T) {
 	TestReconcile(t, ctor, src, adapterFn)
 }
 
-// reconcilerCtor returns a Ctor for a AWSCognitoSource Reconciler.
+// reconcilerCtor returns a Ctor for a AWSCognitoIdentitySource Reconciler.
 func reconcilerCtor(cfg *adapterConfig) Ctor {
 	return func(t *testing.T, ctx context.Context, ls *Listers) controller.Reconciler {
 		base := common.GenericDeploymentReconciler{
@@ -68,15 +68,15 @@ func reconcilerCtor(cfg *adapterConfig) Ctor {
 		}
 
 		return reconcilerv1alpha1.NewReconciler(ctx, logging.FromContext(ctx),
-			fakeinjectionclient.Get(ctx), ls.GetAWSCognitoSourceLister(),
+			fakeinjectionclient.Get(ctx), ls.GetAWSCognitoIdentitySourceLister(),
 			controller.GetEventRecorder(ctx), r)
 	}
 }
 
 // newEventSource returns a test source object with a minimal set of pre-filled attributes.
-func newEventSource() *v1alpha1.AWSCognitoSource {
-	src := &v1alpha1.AWSCognitoSource{
-		Spec: v1alpha1.AWSCognitoSourceSpec{
+func newEventSource() *v1alpha1.AWSCognitoIdentitySource {
+	src := &v1alpha1.AWSCognitoIdentitySource{
+		Spec: v1alpha1.AWSCognitoIdentitySourceSpec{
 			ARN: NewARN(cognitoidentity.ServiceName, "identitypool/triggermeshtest").String(),
 			Credentials: v1alpha1.AWSSecurityCredentials{
 				AccessKeyID: v1alpha1.ValueFromField{
diff --git a/pkg/reconciler/awscognitouserpoolsource/reconciler_test.go b/pkg/reconciler/awscognitouserpoolsource/reconciler_test.go
index 2a04858..65a8cdd 100644
--- a/pkg/reconciler/awscognitouserpoolsource/reconciler_test.go
+++ b/pkg/reconciler/awscognitouserpoolsource/reconciler_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/aws/aws-sdk-go/service/cognitoidentity"
+	"github.com/aws/aws-sdk-go/service/cognitoidentityprovider"
 
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -77,7 +77,7 @@ func reconcilerCtor(cfg *adapterConfig) Ctor {
 func newEventSource(skipCEAtrributes ...interface{}) *v1alpha1.AWSCognitoUserPoolSource {
 	src := &v1alpha1.AWSCognitoUserPoolSource{
 		Spec: v1alpha1.AWSCognitoUserPoolSourceSpec{
-			ARN: NewARN(cognitoidentity.ServiceName, "userpool/triggermeshtest").String(),
+			ARN: NewARN(cognitoidentityprovider.ServiceName, "userpool/triggermeshtest").String(),
 			Credentials: v1alpha1.AWSSecurityCredentials{
 				AccessKeyID: v1alpha1.ValueFromField{
 					ValueFromSecret: &corev1.SecretKeySelector{
diff --git a/pkg/reconciler/testing/listers.go b/pkg/reconciler/testing/listers.go
index 08974f8..1f64a8d 100644
--- a/pkg/reconciler/testing/listers.go
+++ b/pkg/reconciler/testing/listers.go
@@ -90,16 +90,16 @@ func (l *Listers) GetAWSCodeCommitSourceLister() listersv1alpha1.AWSCodeCommitSo
 	return listersv1alpha1.NewAWSCodeCommitSourceLister(l.IndexerFor(&v1alpha1.AWSCodeCommitSource{}))
 }
 
-// GetAWSCognitoSourceLister returns a Lister for AWSCognitoSource objects.
-func (l *Listers) GetAWSCognitoSourceLister() listersv1alpha1.AWSCognitoSourceLister {
-	return listersv1alpha1.NewAWSCognitoSourceLister(l.IndexerFor(&v1alpha1.AWSCognitoSource{}))
-}
-
-// GetAWSCognitoUserPoolSourceLister returns a Lister for AWSCognitoUserPoolSource objects.
+// GetAWSCognitoUserPoolSourceLister returns a Lister for AWSCognitoIdentitySource objects.
 func (l *Listers) GetAWSCognitoUserPoolSourceLister() listersv1alpha1.AWSCognitoUserPoolSourceLister {
 	return listersv1alpha1.NewAWSCognitoUserPoolSourceLister(l.IndexerFor(&v1alpha1.AWSCognitoUserPoolSource{}))
 }
 
+// GetAWSCognitoIdentitySourceLister returns a Lister for AWSCognitoUserPoolSource objects.
+func (l *Listers) GetAWSCognitoIdentitySourceLister() listersv1alpha1.AWSCognitoIdentitySourceLister {
+	return listersv1alpha1.NewAWSCognitoIdentitySourceLister(l.IndexerFor(&v1alpha1.AWSCognitoIdentitySource{}))
+}
+
 // GetAWSDynamoDBSourceLister returns a Lister for AWSDynamoDBSource objects.
 func (l *Listers) GetAWSDynamoDBSourceLister() listersv1alpha1.AWSDynamoDBSourceLister {
 	return listersv1alpha1.NewAWSDynamoDBSourceLister(l.IndexerFor(&v1alpha1.AWSDynamoDBSource{}))