diff --git a/cmd/clusterawsadm/BUILD b/cmd/clusterawsadm/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/BUILD rename to cmd/clusterawsadm/BUILD.bazel diff --git a/cmd/clusterawsadm/client/BUILD b/cmd/clusterawsadm/client/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/client/BUILD rename to cmd/clusterawsadm/client/BUILD.bazel diff --git a/cmd/clusterawsadm/cmd/BUILD b/cmd/clusterawsadm/cmd/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/cmd/BUILD rename to cmd/clusterawsadm/cmd/BUILD.bazel diff --git a/cmd/clusterawsadm/cmd/alpha/BUILD b/cmd/clusterawsadm/cmd/alpha/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/cmd/alpha/BUILD rename to cmd/clusterawsadm/cmd/alpha/BUILD.bazel diff --git a/cmd/clusterawsadm/cmd/alpha/bootstrap/BUILD b/cmd/clusterawsadm/cmd/alpha/bootstrap/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/cmd/alpha/bootstrap/BUILD rename to cmd/clusterawsadm/cmd/alpha/bootstrap/BUILD.bazel diff --git a/cmd/clusterawsadm/cmd/alpha/ec2/BUILD b/cmd/clusterawsadm/cmd/alpha/ec2/BUILD.bazel similarity index 100% rename from cmd/clusterawsadm/cmd/alpha/ec2/BUILD rename to cmd/clusterawsadm/cmd/alpha/ec2/BUILD.bazel diff --git a/cmd/clusterctl/BUILD b/cmd/clusterctl/BUILD.bazel similarity index 100% rename from cmd/clusterctl/BUILD rename to cmd/clusterctl/BUILD.bazel diff --git a/cmd/versioninfo/BUILD b/cmd/versioninfo/BUILD.bazel similarity index 100% rename from cmd/versioninfo/BUILD rename to cmd/versioninfo/BUILD.bazel diff --git a/hack/BUILD b/hack/BUILD.bazel similarity index 100% rename from hack/BUILD rename to hack/BUILD.bazel diff --git a/pkg/apis/BUILD b/pkg/apis/BUILD.bazel similarity index 100% rename from pkg/apis/BUILD rename to pkg/apis/BUILD.bazel diff --git a/pkg/apis/awsprovider/BUILD b/pkg/apis/awsprovider/BUILD.bazel similarity index 100% rename from pkg/apis/awsprovider/BUILD rename to pkg/apis/awsprovider/BUILD.bazel diff --git a/pkg/apis/awsprovider/v1alpha1/BUILD b/pkg/apis/awsprovider/v1alpha1/BUILD.bazel similarity index 100% rename from pkg/apis/awsprovider/v1alpha1/BUILD rename to pkg/apis/awsprovider/v1alpha1/BUILD.bazel diff --git a/pkg/cloud/aws/services/awserrors/BUILD b/pkg/cloud/aws/services/awserrors/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/awserrors/BUILD rename to pkg/cloud/aws/services/awserrors/BUILD.bazel diff --git a/pkg/cloud/aws/services/certificates/BUILD b/pkg/cloud/aws/services/certificates/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/certificates/BUILD rename to pkg/cloud/aws/services/certificates/BUILD.bazel diff --git a/pkg/cloud/aws/services/cloudformation/BUILD b/pkg/cloud/aws/services/cloudformation/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/cloudformation/BUILD rename to pkg/cloud/aws/services/cloudformation/BUILD.bazel diff --git a/pkg/cloud/aws/services/ec2/mock_ec2iface/BUILD b/pkg/cloud/aws/services/ec2/mock_ec2iface/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/ec2/mock_ec2iface/BUILD rename to pkg/cloud/aws/services/ec2/mock_ec2iface/BUILD.bazel diff --git a/pkg/cloud/aws/services/elb/mock_elbiface/BUILD b/pkg/cloud/aws/services/elb/mock_elbiface/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/elb/mock_elbiface/BUILD rename to pkg/cloud/aws/services/elb/mock_elbiface/BUILD.bazel diff --git a/pkg/cloud/aws/services/iam/BUILD b/pkg/cloud/aws/services/iam/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/iam/BUILD rename to pkg/cloud/aws/services/iam/BUILD.bazel diff --git a/pkg/cloud/aws/services/sts/BUILD b/pkg/cloud/aws/services/sts/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/sts/BUILD rename to pkg/cloud/aws/services/sts/BUILD.bazel diff --git a/pkg/cloud/aws/services/wait/BUILD b/pkg/cloud/aws/services/wait/BUILD.bazel similarity index 100% rename from pkg/cloud/aws/services/wait/BUILD rename to pkg/cloud/aws/services/wait/BUILD.bazel diff --git a/pkg/cloudtest/BUILD b/pkg/cloudtest/BUILD.bazel similarity index 100% rename from pkg/cloudtest/BUILD rename to pkg/cloudtest/BUILD.bazel diff --git a/pkg/record/BUILD b/pkg/record/BUILD.bazel similarity index 100% rename from pkg/record/BUILD rename to pkg/record/BUILD.bazel diff --git a/test/e2e/BUILD b/test/e2e/BUILD.bazel similarity index 100% rename from test/e2e/BUILD rename to test/e2e/BUILD.bazel diff --git a/test/integration/BUILD b/test/integration/BUILD.bazel similarity index 100% rename from test/integration/BUILD rename to test/integration/BUILD.bazel