diff --git a/examples/examples_test.go b/examples/examples_test.go
index 5e65872bd34..04b856c6749 100644
--- a/examples/examples_test.go
+++ b/examples/examples_test.go
@@ -265,11 +265,11 @@ func TestExampleObjectSchemas(t *testing.T) {
 		},
 		"../examples/openshift-origin": {
 			"openshift-origin-namespace": &api.Namespace{},
-			"openshift-controller":       &api.ReplicationController{},
+			"openshift-controller":       &extensions.Deployment{},
 			"openshift-service":          &api.Service{},
-			"etcd-controller":            &api.ReplicationController{},
+			"etcd-controller":            &extensions.Deployment{},
 			"etcd-service":               &api.Service{},
-			"etcd-discovery-controller":  &api.ReplicationController{},
+			"etcd-discovery-controller":  &extensions.Deployment{},
 			"etcd-discovery-service":     &api.Service{},
 			"secret":                     nil,
 		},
diff --git a/examples/openshift-origin/etcd-controller.yaml b/examples/openshift-origin/etcd-controller.yaml
index c9bd62b3dea..419c57dbdbb 100644
--- a/examples/openshift-origin/etcd-controller.yaml
+++ b/examples/openshift-origin/etcd-controller.yaml
@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 3
   selector:
-    name: etcd
+    matchLabels:
+      name: etcd
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd
     spec:
@@ -47,7 +43,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false
diff --git a/examples/openshift-origin/etcd-discovery-controller.yaml b/examples/openshift-origin/etcd-discovery-controller.yaml
index 9ed817261c5..33f593ac7f1 100644
--- a/examples/openshift-origin/etcd-discovery-controller.yaml
+++ b/examples/openshift-origin/etcd-discovery-controller.yaml
@@ -1,20 +1,16 @@
-kind: ReplicationController
-apiVersion: v1
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
 spec:
   strategy:
     type: Recreate
-    resources: {}
-  triggers:
-  - type: ConfigChange
   replicas: 1
   selector:
-    name: etcd-discovery
+    matchLabels:
+      name: etcd-discovery
   template:
     metadata:
-      creationTimestamp: 
       labels:
         name: etcd-discovery
     spec:
@@ -29,7 +25,6 @@ spec:
         resources: {}
         terminationMessagePath: "/dev/termination-log"
         imagePullPolicy: IfNotPresent
-        capabilities: {}
         securityContext:
           capabilities: {}
           privileged: false
diff --git a/examples/openshift-origin/etcd-discovery-service.yaml b/examples/openshift-origin/etcd-discovery-service.yaml
index 2c1577114ad..99f464716c4 100644
--- a/examples/openshift-origin/etcd-discovery-service.yaml
+++ b/examples/openshift-origin/etcd-discovery-service.yaml
@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd-discovery
-  creationTimestamp: 
   labels:
     name: etcd-discovery
 spec:
diff --git a/examples/openshift-origin/etcd-service.yaml b/examples/openshift-origin/etcd-service.yaml
index ed4fc27b56f..00bc56ef078 100644
--- a/examples/openshift-origin/etcd-service.yaml
+++ b/examples/openshift-origin/etcd-service.yaml
@@ -2,7 +2,6 @@ kind: Service
 apiVersion: v1
 metadata:
   name: etcd
-  creationTimestamp: 
   labels:
     name: etcd
 spec:
diff --git a/examples/openshift-origin/openshift-controller.yaml b/examples/openshift-origin/openshift-controller.yaml
index 65252747868..5ae604f90bf 100644
--- a/examples/openshift-origin/openshift-controller.yaml
+++ b/examples/openshift-origin/openshift-controller.yaml
@@ -1,13 +1,14 @@
-apiVersion: v1
-kind: ReplicationController
+apiVersion: extensions/v1beta1
+kind: Deployment
 metadata: 
   labels: 
     name: openshift
   name: openshift
 spec: 
   replicas: 1
-  selector: 
-    name: openshift
+  selector:
+    matchLabels:
+      name: openshift
   template: 
     metadata: 
       labels: 
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
index 4e26cc744d2..43be48e63d9 100755
--- a/hack/local-up-cluster.sh
+++ b/hack/local-up-cluster.sh
@@ -624,10 +624,10 @@ function start_kubedns {
         
         # TODO update to dns role once we have one.
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" create clusterrolebinding system:kube-dns --clusterrole=cluster-admin --serviceaccount=kube-system:default
-        # use kubectl to create kubedns rc and service
+        # use kubectl to create kubedns deployment and service
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-deployment.yaml
         ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kubedns-svc.yaml
-        echo "Kube-dns rc and service successfully deployed."
+        echo "Kube-dns deployment and service successfully deployed."
         rm  kubedns-deployment.yaml kubedns-svc.yaml
     fi
 }