diff --git a/cmd/fpga_plugin/README.md b/cmd/fpga_plugin/README.md
index e93fb5d1..dac56d0e 100644
--- a/cmd/fpga_plugin/README.md
+++ b/cmd/fpga_plugin/README.md
@@ -26,15 +26,15 @@ $ ls /var/lib/kubelet/device-plugins/kubelet.sock
 $ export NODE_NAME="<node name>" # if the node's name was overridden and differs from hostname
 $ sudo -E $GOPATH/src/github.com/intel/intel-device-plugins-for-kubernetes/cmd/fpga_plugin/fpga_plugin -mode af -kubeconfig /var/run/kubernetes/admin.kubeconfig
 FPGA device plugin started in af mode
-device-plugin start server at: /var/lib/kubelet/device-plugins/intel-fpga-af-f7df405cbd7acf7222f144b0b93acd18.sock
+device-plugin start server at: /var/lib/kubelet/device-plugins/fpga.intel.com-af-f7df405cbd7acf7222f144b0b93acd18.sock
 device-plugin registered
 ```
 
 ##### Check if FPGA device plugin is registered on master
 ```
-$ kubectl describe node <node name> | grep intel.com/fpga
- intel.com/fpga-af-f7df405cbd7acf7222f144b0b93acd18:  1
- intel.com/fpga-af-f7df405cbd7acf7222f144b0b93acd18:  1
+$ kubectl describe node <node name> | grep fpga.intel.com
+ fpga.intel.com/af-f7df405cbd7acf7222f144b0b93acd18:  1
+ fpga.intel.com/af-f7df405cbd7acf7222f144b0b93acd18:  1
 ```
 
 #### Run FPGA device plugin in region mode
@@ -44,15 +44,15 @@ $ kubectl describe node <node name> | grep intel.com/fpga
 $ export NODE_NAME="<node name>" # if the node's name was overridden and differs from hostname
 $ sudo -E $GOPATH/src/github.com/intel/intel-device-plugins-for-kubernetes/cmd/fpga_plugin/fpga_plugin -mode region -kubeconfig /var/run/kubernetes/admin.kubeconfig
 FPGA device plugin started in region mode
-device-plugin start server at: /var/lib/kubelet/device-plugins/intel-fpga-region-ce48969398f05f33946d560708be108a.sock
+device-plugin start server at: /var/lib/kubelet/device-plugins/fpga.intel.com-region-ce48969398f05f33946d560708be108a.sock
 device-plugin registered
 ```
 
 ##### Check if FPGA device plugin is registered on master
 ```
-$ kubectl describe node <node name> | grep intel.com/fpga
- intel.com/fpga-region-ce48969398f05f33946d560708be108a:  1
- intel.com/fpga-region-ce48969398f05f33946d560708be108a:  1
+$ kubectl describe node <node name> | grep fpga.intel.com
+ fpga.intel.com/region-ce48969398f05f33946d560708be108a:  1
+ fpga.intel.com/region-ce48969398f05f33946d560708be108a:  1
 ```
 
 ### Deploy FPGA device plugin as DaemonSet
diff --git a/cmd/gpu_plugin/README.md b/cmd/gpu_plugin/README.md
index 4cc95eae..336549c3 100644
--- a/cmd/gpu_plugin/README.md
+++ b/cmd/gpu_plugin/README.md
@@ -22,21 +22,15 @@ $ ls /var/lib/kubelet/device-plugins/kubelet.sock
 ### Run GPU device plugin as administrator
 ```
 $ sudo $GOPATH/src/github.com/intel/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/gpu_plugin
-GPU device plugin started
-Adding '/dev/dri/card0' to GPU 'card0'
-Adding '/dev/dri/controlD64' to GPU 'card0'
-Adding '/dev/dri/renderD128' to GPU 'card0'
-device-plugin start server at: /var/lib/kubelet/device-plugins/intelGPU.sock
+device-plugin start server at: /var/lib/kubelet/device-plugins/gpu.intel.com-i915.sock
 device-plugin registered
-device-plugin: ListAndWatch start
-ListAndWatch: send devices &ListAndWatchResponse{Devices:[&Device{ID:card0,Health:Healthy,}],}
 ```
 
 ### Check if GPU device plugin is registered on master
 ```
-$ kubectl describe node <node name> | grep intel.com/gpu
- intel.com/gpu:  1
- intel.com/gpu:  1
+$ kubectl describe node <node name> | grep gpu.intel.com
+ gpu.intel.com/i915:  1
+ gpu.intel.com/i915:  1
 ```
 
 ### Test GPU device plugin
diff --git a/demo/intelfpga-job.yaml b/demo/intelfpga-job.yaml
index 470e8e81..a25da03e 100644
--- a/demo/intelfpga-job.yaml
+++ b/demo/intelfpga-job.yaml
@@ -24,4 +24,4 @@ spec:
             limits:
               cpu: 1
               hugepages-2Mi: 20Mi
-              intel.com/fpga-d8424dc4a4a3c413f89e433683f9040b: 1
+              fpga.intel.com/af-d8424dc4a4a3c413f89e433683f9040b: 1
diff --git a/demo/intelgpu-job.yaml b/demo/intelgpu-job.yaml
index a03ba5bd..4bf4da60 100644
--- a/demo/intelgpu-job.yaml
+++ b/demo/intelgpu-job.yaml
@@ -19,4 +19,4 @@ spec:
           command: [ "/run-opencl-example.sh", "/root/6-1/fft" ]
           resources:
             limits:
-              intel.com/gpu: 1
+              gpu.intel.com/i915: 1