diff --git a/cinder-powervc/bin/cinder-powervc b/cinder-powervc/bin/cinder-powervc
index 244320a..c320104 100644
--- a/cinder-powervc/bin/cinder-powervc
+++ b/cinder-powervc/bin/cinder-powervc
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """Starter script for the PowerVC cinder-volume Service."""
 
diff --git a/cinder-powervc/powervc/__init__.py b/cinder-powervc/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/cinder-powervc/powervc/__init__.py
+++ b/cinder-powervc/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/cinder-powervc/powervc/volume/driver/__init__.py b/cinder-powervc/powervc/volume/driver/__init__.py
index 4bea874..2ffeb52 100644
--- a/cinder-powervc/powervc/volume/driver/__init__.py
+++ b/cinder-powervc/powervc/volume/driver/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/cinder-powervc/powervc/volume/driver/powervc.py b/cinder-powervc/powervc/volume/driver/powervc.py
index 59f53b6..8c09799 100644
--- a/cinder-powervc/powervc/volume/driver/powervc.py
+++ b/cinder-powervc/powervc/volume/driver/powervc.py
@@ -1,13 +1,5 @@
 from __future__ import absolute_import
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import logging
 import sys
 
diff --git a/cinder-powervc/powervc/volume/driver/service.py b/cinder-powervc/powervc/volume/driver/service.py
index 05d659d..5064ba4 100644
--- a/cinder-powervc/powervc/volume/driver/service.py
+++ b/cinder-powervc/powervc/volume/driver/service.py
@@ -1,13 +1,5 @@
 from __future__ import absolute_import
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import httplib
 
diff --git a/cinder-powervc/powervc/volume/manager/__init__.py b/cinder-powervc/powervc/volume/manager/__init__.py
index 4bea874..2ffeb52 100644
--- a/cinder-powervc/powervc/volume/manager/__init__.py
+++ b/cinder-powervc/powervc/volume/manager/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/cinder-powervc/powervc/volume/manager/constants.py b/cinder-powervc/powervc/volume/manager/constants.py
index 062fa84..75ba28a 100644
--- a/cinder-powervc/powervc/volume/manager/constants.py
+++ b/cinder-powervc/powervc/volume/manager/constants.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 All constants.
diff --git a/cinder-powervc/powervc/volume/manager/manager.py b/cinder-powervc/powervc/volume/manager/manager.py
index a2f10b8..c66fdd8 100644
--- a/cinder-powervc/powervc/volume/manager/manager.py
+++ b/cinder-powervc/powervc/volume/manager/manager.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 # from cinderclient.v1 import client
 import cinder.db.sqlalchemy.models
diff --git a/cinder-powervc/test/cinderclienttest.py b/cinder-powervc/test/cinderclienttest.py
index 057d66f..899dba4 100644
--- a/cinder-powervc/test/cinderclienttest.py
+++ b/cinder-powervc/test/cinderclienttest.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Simple cinder client tests
diff --git a/cinder-powervc/test/fake_volume_type.py b/cinder-powervc/test/fake_volume_type.py
index c441a67..8dc8e93 100644
--- a/cinder-powervc/test/fake_volume_type.py
+++ b/cinder-powervc/test/fake_volume_type.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeVolumeType is used to produce the fake
diff --git a/cinder-powervc/test/powervc/volume/driver/test_powervc_cinder.py b/cinder-powervc/test/powervc/volume/driver/test_powervc_cinder.py
index 5c4dedd..5119f10 100644
--- a/cinder-powervc/test/powervc/volume/driver/test_powervc_cinder.py
+++ b/cinder-powervc/test/powervc/volume/driver/test_powervc_cinder.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 # mock module
 import mock
 import sys
diff --git a/cinder-powervc/test/powervc/volume/manager/test_manager.py b/cinder-powervc/test/powervc/volume/manager/test_manager.py
index fbeff1e..365cf9d 100644
--- a/cinder-powervc/test/powervc/volume/manager/test_manager.py
+++ b/cinder-powervc/test/powervc/volume/manager/test_manager.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 import unittest
diff --git a/common-powervc/powervc/__init__.py b/common-powervc/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/powervc/__init__.py
+++ b/common-powervc/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/powervc/common/__init__.py b/common-powervc/powervc/common/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/powervc/common/__init__.py
+++ b/common-powervc/powervc/common/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/powervc/common/client/__init__.py b/common-powervc/powervc/common/client/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/powervc/common/client/__init__.py
+++ b/common-powervc/powervc/common/client/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/powervc/common/client/config.py b/common-powervc/powervc/common/client/config.py
index 1d431c9..2f8a959 100644
--- a/common-powervc/powervc/common/client/config.py
+++ b/common-powervc/powervc/common/client/config.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from powervc.common import config
 from powervc.common import netutils
diff --git a/common-powervc/powervc/common/client/delegate.py b/common-powervc/powervc/common/client/delegate.py
index fabde65..635b561 100644
--- a/common-powervc/powervc/common/client/delegate.py
+++ b/common-powervc/powervc/common/client/delegate.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 def new_composite_deletgate(delegates):
diff --git a/common-powervc/powervc/common/client/extensions/__init__.py b/common-powervc/powervc/common/client/extensions/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/powervc/common/client/extensions/__init__.py
+++ b/common-powervc/powervc/common/client/extensions/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/powervc/common/client/extensions/base.py b/common-powervc/powervc/common/client/extensions/base.py
index 05dfe11..aab35f2 100644
--- a/common-powervc/powervc/common/client/extensions/base.py
+++ b/common-powervc/powervc/common/client/extensions/base.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 class ClientExtension(object):
diff --git a/common-powervc/powervc/common/client/extensions/cinder.py b/common-powervc/powervc/common/client/extensions/cinder.py
index d3f8890..176ceaf 100644
--- a/common-powervc/powervc/common/client/extensions/cinder.py
+++ b/common-powervc/powervc/common/client/extensions/cinder.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import six
 import urllib
diff --git a/common-powervc/powervc/common/client/extensions/glance.py b/common-powervc/powervc/common/client/extensions/glance.py
index 28f7348..3fd64bc 100644
--- a/common-powervc/powervc/common/client/extensions/glance.py
+++ b/common-powervc/powervc/common/client/extensions/glance.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import powervc.common.client.extensions.base as base
 
diff --git a/common-powervc/powervc/common/client/extensions/nova.py b/common-powervc/powervc/common/client/extensions/nova.py
index 26c088d..609fb84 100644
--- a/common-powervc/powervc/common/client/extensions/nova.py
+++ b/common-powervc/powervc/common/client/extensions/nova.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import six
 import urllib
diff --git a/common-powervc/powervc/common/client/factory.py b/common-powervc/powervc/common/client/factory.py
index 0821f7e..9ccd817 100644
--- a/common-powervc/powervc/common/client/factory.py
+++ b/common-powervc/powervc/common/client/factory.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import powervc.common.client.service as service
 from powervc.common.client.config import CONF as CONF
diff --git a/common-powervc/powervc/common/client/patch/__init__.py b/common-powervc/powervc/common/client/patch/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/powervc/common/client/patch/__init__.py
+++ b/common-powervc/powervc/common/client/patch/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/powervc/common/client/patch/cinder.py b/common-powervc/powervc/common/client/patch/cinder.py
index b9affdd..9bccda6 100644
--- a/common-powervc/powervc/common/client/patch/cinder.py
+++ b/common-powervc/powervc/common/client/patch/cinder.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 def patch_client(service_wrapper, client):
diff --git a/common-powervc/powervc/common/client/patch/glance.py b/common-powervc/powervc/common/client/patch/glance.py
index f177e96..dda0be8 100644
--- a/common-powervc/powervc/common/client/patch/glance.py
+++ b/common-powervc/powervc/common/client/patch/glance.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import warlock
 
diff --git a/common-powervc/powervc/common/client/patch/neutron.py b/common-powervc/powervc/common/client/patch/neutron.py
index aa72b52..a7d7418 100644
--- a/common-powervc/powervc/common/client/patch/neutron.py
+++ b/common-powervc/powervc/common/client/patch/neutron.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 def patch_client(service_wrapper, client):
diff --git a/common-powervc/powervc/common/client/patch/nova.py b/common-powervc/powervc/common/client/patch/nova.py
index b9e06fe..e85cdf1 100644
--- a/common-powervc/powervc/common/client/patch/nova.py
+++ b/common-powervc/powervc/common/client/patch/nova.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 def patch_client(service_wrapper, client):
diff --git a/common-powervc/powervc/common/client/service.py b/common-powervc/powervc/common/client/service.py
index 2392023..7b7e732 100644
--- a/common-powervc/powervc/common/client/service.py
+++ b/common-powervc/powervc/common/client/service.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import urlparse
 import re
diff --git a/common-powervc/powervc/common/config.py b/common-powervc/powervc/common/config.py
index 6da10d5..4c4c5e5 100644
--- a/common-powervc/powervc/common/config.py
+++ b/common-powervc/powervc/common/config.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """Config file utility
 
diff --git a/common-powervc/powervc/common/constants.py b/common-powervc/powervc/common/constants.py
index 70dee4a..972e94d 100644
--- a/common-powervc/powervc/common/constants.py
+++ b/common-powervc/powervc/common/constants.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 All Common PowerVC Driver Constants
diff --git a/common-powervc/powervc/common/exception.py b/common-powervc/powervc/common/exception.py
index acdd791..e984912 100644
--- a/common-powervc/powervc/common/exception.py
+++ b/common-powervc/powervc/common/exception.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 PowerVC Driver Common Exceptions
diff --git a/common-powervc/powervc/common/gettextutils.py b/common-powervc/powervc/common/gettextutils.py
index c58ab41..a75709a 100644
--- a/common-powervc/powervc/common/gettextutils.py
+++ b/common-powervc/powervc/common/gettextutils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import gettext
 
diff --git a/common-powervc/powervc/common/messaging.py b/common-powervc/powervc/common/messaging.py
index beb6935..ef9ba24 100644
--- a/common-powervc/powervc/common/messaging.py
+++ b/common-powervc/powervc/common/messaging.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 This module contains Qpid connection utilities that can be used to connect
diff --git a/common-powervc/powervc/common/netutils.py b/common-powervc/powervc/common/netutils.py
index 7b85029..b59ab73 100644
--- a/common-powervc/powervc/common/netutils.py
+++ b/common-powervc/powervc/common/netutils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import json
 import socket
diff --git a/common-powervc/powervc/common/utils.py b/common-powervc/powervc/common/utils.py
index dc867eb..7ec5f13 100644
--- a/common-powervc/powervc/common/utils.py
+++ b/common-powervc/powervc/common/utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import logging
 import exception
 import os
diff --git a/common-powervc/test/__init__.py b/common-powervc/test/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/test/__init__.py
+++ b/common-powervc/test/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/test/common/__init__.py b/common-powervc/test/common/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/test/common/__init__.py
+++ b/common-powervc/test/common/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/test/common/client/__init__.py b/common-powervc/test/common/client/__init__.py
index 4bea874..2ffeb52 100644
--- a/common-powervc/test/common/client/__init__.py
+++ b/common-powervc/test/common/client/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/common-powervc/test/common/client/test_cinder.py b/common-powervc/test/common/client/test_cinder.py
index 03d11d2..333ac27 100644
--- a/common-powervc/test/common/client/test_cinder.py
+++ b/common-powervc/test/common/client/test_cinder.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from cinderclient.tests.v1 import fakes
 from cinderclient.tests.v1.test_volumes import VolumesTest
diff --git a/common-powervc/test/common/client/test_delegate.py b/common-powervc/test/common/client/test_delegate.py
index 8fb4fb8..e6f350f 100644
--- a/common-powervc/test/common/client/test_delegate.py
+++ b/common-powervc/test/common/client/test_delegate.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 from powervc.common.client import delegate
diff --git a/common-powervc/test/common/client/test_glance.py b/common-powervc/test/common/client/test_glance.py
index 8eb2776..7343394 100644
--- a/common-powervc/test/common/client/test_glance.py
+++ b/common-powervc/test/common/client/test_glance.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import unittest
 import mox
 from mock import MagicMock
diff --git a/common-powervc/test/common/client/test_nova.py b/common-powervc/test/common/client/test_nova.py
index de0a2d4..ea7d8f2 100644
--- a/common-powervc/test/common/client/test_nova.py
+++ b/common-powervc/test/common/client/test_nova.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import unittest
 from mock import MagicMock
 from mock import patch
diff --git a/common-powervc/test/common/test_config.py b/common-powervc/test/common/test_config.py
index 190ae6c..458434f 100644
--- a/common-powervc/test/common/test_config.py
+++ b/common-powervc/test/common/test_config.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 import mock
diff --git a/common-powervc/test/common/test_messaging.py b/common-powervc/test/common/test_messaging.py
index 530d9e1..d9cda73 100644
--- a/common-powervc/test/common/test_messaging.py
+++ b/common-powervc/test/common/test_messaging.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import unittest
 from powervc.common.messaging import QpidConnection
 
diff --git a/common-powervc/test/common/test_netutils.py b/common-powervc/test/common/test_netutils.py
index f04d6b1..d7943a4 100644
--- a/common-powervc/test/common/test_netutils.py
+++ b/common-powervc/test/common/test_netutils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 import testtools
diff --git a/common-powervc/test/common/test_utils.py b/common-powervc/test/common/test_utils.py
index f0bc2f7..3d4cca5 100644
--- a/common-powervc/test/common/test_utils.py
+++ b/common-powervc/test/common/test_utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sys
 import eventlet
diff --git a/glance-powervc/bin/glance-powervc b/glance-powervc/bin/glance-powervc
index 5ccb6ae..0ddd4c8 100644
--- a/glance-powervc/bin/glance-powervc
+++ b/glance-powervc/bin/glance-powervc
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """Starter script for the PowerVC Driver ImageManager Service."""
 
diff --git a/glance-powervc/powervc/__init__.py b/glance-powervc/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/glance-powervc/powervc/__init__.py
+++ b/glance-powervc/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/glance-powervc/powervc/glance/__init__.py b/glance-powervc/powervc/glance/__init__.py
index 4bea874..2ffeb52 100644
--- a/glance-powervc/powervc/glance/__init__.py
+++ b/glance-powervc/powervc/glance/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/glance-powervc/powervc/glance/common/__init__.py b/glance-powervc/powervc/glance/common/__init__.py
index 4bea874..2ffeb52 100644
--- a/glance-powervc/powervc/glance/common/__init__.py
+++ b/glance-powervc/powervc/glance/common/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/glance-powervc/powervc/glance/common/config.py b/glance-powervc/powervc/glance/common/config.py
index 516066a..7c0cd3f 100644
--- a/glance-powervc/powervc/glance/common/config.py
+++ b/glance-powervc/powervc/glance/common/config.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 PowerVC Driver ImageManager Configuration
diff --git a/glance-powervc/powervc/glance/common/constants.py b/glance-powervc/powervc/glance/common/constants.py
index 196f1b0..0b041cb 100644
--- a/glance-powervc/powervc/glance/common/constants.py
+++ b/glance-powervc/powervc/glance/common/constants.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 All PowerVC Driver ImageManager Constants
diff --git a/glance-powervc/powervc/glance/manager/__init__.py b/glance-powervc/powervc/glance/manager/__init__.py
index 4bea874..2ffeb52 100644
--- a/glance-powervc/powervc/glance/manager/__init__.py
+++ b/glance-powervc/powervc/glance/manager/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/glance-powervc/powervc/glance/manager/manager.py b/glance-powervc/powervc/glance/manager/manager.py
index fbd001f..0d4668a 100644
--- a/glance-powervc/powervc/glance/manager/manager.py
+++ b/glance-powervc/powervc/glance/manager/manager.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 PowerVC Driver ImageManager service
diff --git a/glance-powervc/test/__init__.py b/glance-powervc/test/__init__.py
index 4bea874..2ffeb52 100644
--- a/glance-powervc/test/__init__.py
+++ b/glance-powervc/test/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/glance-powervc/test/test_glance_client.py.fails b/glance-powervc/test/test_glance_client.py.fails
index c835d80..039f343 100644
--- a/glance-powervc/test/test_glance_client.py.fails
+++ b/glance-powervc/test/test_glance_client.py.fails
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Simple Glance client test. This should be more like junits someday. For
diff --git a/glance-powervc/test/test_messaging.py.fails b/glance-powervc/test/test_messaging.py.fails
index 0340f74..774807b 100644
--- a/glance-powervc/test/test_messaging.py.fails
+++ b/glance-powervc/test/test_messaging.py.fails
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sys
 import itertools
diff --git a/neutron-powervc/bin/neutron-powervc b/neutron-powervc/bin/neutron-powervc
index 87fe2db..6958c94 100755
--- a/neutron-powervc/bin/neutron-powervc
+++ b/neutron-powervc/bin/neutron-powervc
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sys
 import traceback
diff --git a/neutron-powervc/bin/neutron-powervc-agent b/neutron-powervc/bin/neutron-powervc-agent
index 518e2f1..512bd0a 100755
--- a/neutron-powervc/bin/neutron-powervc-agent
+++ b/neutron-powervc/bin/neutron-powervc-agent
@@ -1,13 +1,5 @@
 #!/usr/bin/env python
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import os
 import sys
diff --git a/neutron-powervc/powervc/__init__.py b/neutron-powervc/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/__init__.py
+++ b/neutron-powervc/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/__init__.py b/neutron-powervc/powervc/neutron/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/__init__.py
+++ b/neutron-powervc/powervc/neutron/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/agent/__init__.py b/neutron-powervc/powervc/neutron/agent/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/agent/__init__.py
+++ b/neutron-powervc/powervc/neutron/agent/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/agent/neutron_powervc_agent.py b/neutron-powervc/powervc/neutron/agent/neutron_powervc_agent.py
index 2d2792c..cc3c2b2 100644
--- a/neutron-powervc/powervc/neutron/agent/neutron_powervc_agent.py
+++ b/neutron-powervc/powervc/neutron/agent/neutron_powervc_agent.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Handles all of the Neutron logic necessary for PowerVC driver.
diff --git a/neutron-powervc/powervc/neutron/api/__init__.py b/neutron-powervc/powervc/neutron/api/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/api/__init__.py
+++ b/neutron-powervc/powervc/neutron/api/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/api/client_rpc.py b/neutron-powervc/powervc/neutron/api/client_rpc.py
index 5cae3ef..b3925db 100644
--- a/neutron-powervc/powervc/neutron/api/client_rpc.py
+++ b/neutron-powervc/powervc/neutron/api/client_rpc.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from oslo.config import cfg
 from prettytable import PrettyTable
diff --git a/neutron-powervc/powervc/neutron/api/powervc_rpc.py b/neutron-powervc/powervc/neutron/api/powervc_rpc.py
index 4e0cc3c..1b71852 100644
--- a/neutron-powervc/powervc/neutron/api/powervc_rpc.py
+++ b/neutron-powervc/powervc/neutron/api/powervc_rpc.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from neutron.openstack.common import log as logging
 from neutron.openstack.common.rpc import dispatcher
diff --git a/neutron-powervc/powervc/neutron/client/__init__.py b/neutron-powervc/powervc/neutron/client/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/client/__init__.py
+++ b/neutron-powervc/powervc/neutron/client/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/client/local_os_bindings.py b/neutron-powervc/powervc/neutron/client/local_os_bindings.py
index 495e805..618247d 100644
--- a/neutron-powervc/powervc/neutron/client/local_os_bindings.py
+++ b/neutron-powervc/powervc/neutron/client/local_os_bindings.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Module to contain all of the local OS routines
diff --git a/neutron-powervc/powervc/neutron/client/neutron_client_bindings.py b/neutron-powervc/powervc/neutron/client/neutron_client_bindings.py
index 7f109c9..625dc12 100644
--- a/neutron-powervc/powervc/neutron/client/neutron_client_bindings.py
+++ b/neutron-powervc/powervc/neutron/client/neutron_client_bindings.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Module to contain all of the base Neutron client interfaces
diff --git a/neutron-powervc/powervc/neutron/client/powervc_bindings.py b/neutron-powervc/powervc/neutron/client/powervc_bindings.py
index d3a2f8e..d089973 100644
--- a/neutron-powervc/powervc/neutron/client/powervc_bindings.py
+++ b/neutron-powervc/powervc/neutron/client/powervc_bindings.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Module to contain all of the PowerVC routines
diff --git a/neutron-powervc/powervc/neutron/common/__init__.py b/neutron-powervc/powervc/neutron/common/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/common/__init__.py
+++ b/neutron-powervc/powervc/neutron/common/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/common/constants.py b/neutron-powervc/powervc/neutron/common/constants.py
index 85597df..fe3358b 100644
--- a/neutron-powervc/powervc/neutron/common/constants.py
+++ b/neutron-powervc/powervc/neutron/common/constants.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 '''
 Created on Aug 2, 2013
diff --git a/neutron-powervc/powervc/neutron/common/utils.py b/neutron-powervc/powervc/neutron/common/utils.py
index e086d26..77adfa9 100644
--- a/neutron-powervc/powervc/neutron/common/utils.py
+++ b/neutron-powervc/powervc/neutron/common/utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 '''
 Created on Aug 2, 2013
diff --git a/neutron-powervc/powervc/neutron/db/__init__.py b/neutron-powervc/powervc/neutron/db/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/powervc/neutron/db/__init__.py
+++ b/neutron-powervc/powervc/neutron/db/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/powervc/neutron/db/powervc_db_v2.py b/neutron-powervc/powervc/neutron/db/powervc_db_v2.py
index 14851bb..796e7cd 100644
--- a/neutron-powervc/powervc/neutron/db/powervc_db_v2.py
+++ b/neutron-powervc/powervc/neutron/db/powervc_db_v2.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from sqlalchemy.orm import exc
 
diff --git a/neutron-powervc/powervc/neutron/db/powervc_models_v2.py b/neutron-powervc/powervc/neutron/db/powervc_models_v2.py
index 7fff2cb..dcdf50c 100644
--- a/neutron-powervc/powervc/neutron/db/powervc_models_v2.py
+++ b/neutron-powervc/powervc/neutron/db/powervc_models_v2.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sqlalchemy as sa
 
diff --git a/neutron-powervc/test/__init__.py b/neutron-powervc/test/__init__.py
index 4bea874..2ffeb52 100644
--- a/neutron-powervc/test/__init__.py
+++ b/neutron-powervc/test/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/neutron-powervc/test/fake_os_network.py b/neutron-powervc/test/fake_os_network.py
index e67cc5b..7cfdd0f 100644
--- a/neutron-powervc/test/fake_os_network.py
+++ b/neutron-powervc/test/fake_os_network.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeOSNetwork is used to represent the OpenStack Network instance
diff --git a/neutron-powervc/test/fake_powervc_network.py b/neutron-powervc/test/fake_powervc_network.py
index 18199f6..5ea4065 100644
--- a/neutron-powervc/test/fake_powervc_network.py
+++ b/neutron-powervc/test/fake_powervc_network.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     One example of PowerVC network instance:
diff --git a/neutron-powervc/test/rpc_client.py b/neutron-powervc/test/rpc_client.py
index 2f3e7db..fe437a1 100755
--- a/neutron-powervc/test/rpc_client.py
+++ b/neutron-powervc/test/rpc_client.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sys
 import traceback
diff --git a/neutron-powervc/test/rpc_listener.py b/neutron-powervc/test/rpc_listener.py
index c44a902..deb20f8 100755
--- a/neutron-powervc/test/rpc_listener.py
+++ b/neutron-powervc/test/rpc_listener.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import sys
 import time
diff --git a/neutron-powervc/test/test_neutron_powervc_agent.py b/neutron-powervc/test/test_neutron_powervc_agent.py
index ce4c86e..23015a8 100644
--- a/neutron-powervc/test/test_neutron_powervc_agent.py
+++ b/neutron-powervc/test/test_neutron_powervc_agent.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Test methods in PowerVCNeutronAgent
diff --git a/neutron-powervc/test/test_powervc_db_v2.py b/neutron-powervc/test/test_powervc_db_v2.py
index c79e1bc..253465d 100644
--- a/neutron-powervc/test/test_powervc_db_v2.py
+++ b/neutron-powervc/test/test_powervc_db_v2.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 import mox
diff --git a/neutron-powervc/test/test_utils.py b/neutron-powervc/test/test_utils.py
index d04cdbf..e993985 100644
--- a/neutron-powervc/test/test_utils.py
+++ b/neutron-powervc/test/test_utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 import mox
diff --git a/nova-powervc/powervc/nova/cmd/__init__.py b/nova-powervc/powervc/nova/cmd/__init__.py
index 08f38b4..abea51f 100644
--- a/nova-powervc/powervc/nova/cmd/__init__.py
+++ b/nova-powervc/powervc/nova/cmd/__init__.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 # TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR
 import os
diff --git a/nova-powervc/powervc/nova/cmd/compute.py b/nova-powervc/powervc/nova/cmd/compute.py
index 169fdee..b80ffaf 100644
--- a/nova-powervc/powervc/nova/cmd/compute.py
+++ b/nova-powervc/powervc/nova/cmd/compute.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 
 import sys
diff --git a/nova-powervc/powervc/nova/common/__init__.py b/nova-powervc/powervc/nova/common/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/powervc/nova/common/__init__.py
+++ b/nova-powervc/powervc/nova/common/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/powervc/nova/common/config.py b/nova-powervc/powervc/nova/common/config.py
index 93651b3..14564a2 100644
--- a/nova-powervc/powervc/nova/common/config.py
+++ b/nova-powervc/powervc/nova/common/config.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import powervc.common.config as common_config
 from nova import rpc
diff --git a/nova-powervc/powervc/nova/common/exception.py b/nova-powervc/powervc/nova/common/exception.py
index c7f8858..ab4d7ef 100644
--- a/nova-powervc/powervc/nova/common/exception.py
+++ b/nova-powervc/powervc/nova/common/exception.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from nova import exception
 from powervc.common.gettextutils import _
diff --git a/nova-powervc/powervc/nova/driver/compute/computes.py b/nova-powervc/powervc/nova/driver/compute/computes.py
index 05724be..3ab56be 100644
--- a/nova-powervc/powervc/nova/driver/compute/computes.py
+++ b/nova-powervc/powervc/nova/driver/compute/computes.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 '''
 This module manages the virtual nova compute services managed by the PowerVC
diff --git a/nova-powervc/powervc/nova/driver/compute/constants.py b/nova-powervc/powervc/nova/driver/compute/constants.py
index 10bdb8b..9177033 100644
--- a/nova-powervc/powervc/nova/driver/compute/constants.py
+++ b/nova-powervc/powervc/nova/driver/compute/constants.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 All constants.
diff --git a/nova-powervc/powervc/nova/driver/compute/manager.py b/nova-powervc/powervc/nova/driver/compute/manager.py
index 2722749..aa5f322 100644
--- a/nova-powervc/powervc/nova/driver/compute/manager.py
+++ b/nova-powervc/powervc/nova/driver/compute/manager.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Doing PowerVC initialize work, including image, instance sync.
diff --git a/nova-powervc/powervc/nova/driver/compute/task_states.py b/nova-powervc/powervc/nova/driver/compute/task_states.py
index cba6291..33dcc6f 100644
--- a/nova-powervc/powervc/nova/driver/compute/task_states.py
+++ b/nova-powervc/powervc/nova/driver/compute/task_states.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
 Task states unique to PowerVC.
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/__init__.py b/nova-powervc/powervc/nova/driver/virt/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/__init__.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py
index ab319e2..6e5378a 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/driver.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/driver.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import nova
 from novaclient.exceptions import NotFound
 from novaclient.exceptions import BadRequest
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/pvc_vm_states.py b/nova-powervc/powervc/nova/driver/virt/powervc/pvc_vm_states.py
index 1bfd5ce..17c736a 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/pvc_vm_states.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/pvc_vm_states.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 ACTIVE = u'ACTIVE'  # PowerVC VM is running
 BUILD = u'BUILD'  # PowerVC VM only exists in DB
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py b/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py
index 14edaeb..84fd779 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/rpcapi.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 from nova import rpc
 from oslo.messaging import Target
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/service.py b/nova-powervc/powervc/nova/driver/virt/powervc/service.py
index 3343c6e..65a0876 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/service.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/service.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import httplib
 from novaclient import exceptions
diff --git a/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py b/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py
index 3e90814..a78e42d 100644
--- a/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py
+++ b/nova-powervc/powervc/nova/driver/virt/powervc/sync/flavorsync.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import re
 from eventlet import greenthread
diff --git a/nova-powervc/powervc/nova/extension/__init__.py b/nova-powervc/powervc/nova/extension/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/powervc/nova/extension/__init__.py
+++ b/nova-powervc/powervc/nova/extension/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/powervc/nova/extension/extended_powervm.py b/nova-powervc/powervc/nova/extension/extended_powervm.py
index 64d8f8b..b4f53e9 100644
--- a/nova-powervc/powervc/nova/extension/extended_powervm.py
+++ b/nova-powervc/powervc/nova/extension/extended_powervm.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """The Extended Server Attributes API extension."""
 
diff --git a/nova-powervc/powervc/utils.py b/nova-powervc/powervc/utils.py
index 716d701..98e00b4 100644
--- a/nova-powervc/powervc/utils.py
+++ b/nova-powervc/powervc/utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """PowerVC Driver related Utilities"""
 
diff --git a/nova-powervc/test/__init__.py b/nova-powervc/test/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/__init__.py
+++ b/nova-powervc/test/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/compute/__init__.py b/nova-powervc/test/compute/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/compute/__init__.py
+++ b/nova-powervc/test/compute/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/compute/test_sync_instance.py b/nova-powervc/test/compute/test_sync_instance.py
index ceacb0c..df4fd7c 100644
--- a/nova-powervc/test/compute/test_sync_instance.py
+++ b/nova-powervc/test/compute/test_sync_instance.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 import unittest
 import mox
 
diff --git a/nova-powervc/test/fake_ctx.py b/nova-powervc/test/fake_ctx.py
index e8b4cb4..96c468d 100644
--- a/nova-powervc/test/fake_ctx.py
+++ b/nova-powervc/test/fake_ctx.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeCTX is used to produce the fake data of CTX
diff --git a/nova-powervc/test/fake_os_flavor.py b/nova-powervc/test/fake_os_flavor.py
index e84106e..bb2ec4e 100644
--- a/nova-powervc/test/fake_os_flavor.py
+++ b/nova-powervc/test/fake_os_flavor.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeOSFlavor is used to produce
diff --git a/nova-powervc/test/fake_os_image.py b/nova-powervc/test/fake_os_image.py
index c7a852a..b499a4a 100644
--- a/nova-powervc/test/fake_os_image.py
+++ b/nova-powervc/test/fake_os_image.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeOSImage is used to produce
diff --git a/nova-powervc/test/fake_os_instance.py b/nova-powervc/test/fake_os_instance.py
index 6fb3b59..31c0079 100644
--- a/nova-powervc/test/fake_os_instance.py
+++ b/nova-powervc/test/fake_os_instance.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakeOSInstance is used to produce the fake
diff --git a/nova-powervc/test/fake_pvc_flavor.py b/nova-powervc/test/fake_pvc_flavor.py
index 23b8e1a..706ce0e 100644
--- a/nova-powervc/test/fake_pvc_flavor.py
+++ b/nova-powervc/test/fake_pvc_flavor.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakePVCFlavor is used to produce
diff --git a/nova-powervc/test/fake_pvc_image.py b/nova-powervc/test/fake_pvc_image.py
index 0440cf7..3dcc5c1 100644
--- a/nova-powervc/test/fake_pvc_image.py
+++ b/nova-powervc/test/fake_pvc_image.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 """
     The class FakePVCImage is used to produce
diff --git a/nova-powervc/test/fake_pvc_instance.py b/nova-powervc/test/fake_pvc_instance.py
index 2c89e44..ef5c172 100644
--- a/nova-powervc/test/fake_pvc_instance.py
+++ b/nova-powervc/test/fake_pvc_instance.py
@@ -1,13 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013, 2014 All Rights Reserved
-
-*************************************************************
-"""
+# Copyright 2013, 2014 IBM Corp.
 
 """
     The class FakePVCInstance is used to produce
diff --git a/nova-powervc/test/nova/__init__.py b/nova-powervc/test/nova/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/nova/__init__.py
+++ b/nova-powervc/test/nova/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/nova/driver/__init__.py b/nova-powervc/test/nova/driver/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/nova/driver/__init__.py
+++ b/nova-powervc/test/nova/driver/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/nova/driver/virt/__init__.py b/nova-powervc/test/nova/driver/virt/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/nova/driver/virt/__init__.py
+++ b/nova-powervc/test/nova/driver/virt/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/nova/driver/virt/powervc/__init__.py b/nova-powervc/test/nova/driver/virt/powervc/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/__init__.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/nova/driver/virt/powervc/sync/__init__.py b/nova-powervc/test/nova/driver/virt/powervc/sync/__init__.py
index 4bea874..2ffeb52 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/sync/__init__.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/sync/__init__.py
@@ -1,9 +1 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
diff --git a/nova-powervc/test/nova/driver/virt/powervc/sync/testflavorsync.py b/nova-powervc/test/nova/driver/virt/powervc/sync/testflavorsync.py
index 3158435..43a85f8 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/sync/testflavorsync.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/sync/testflavorsync.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 import mox
diff --git a/nova-powervc/test/nova/driver/virt/powervc/test_driver.py b/nova-powervc/test/nova/driver/virt/powervc/test_driver.py
index d0e7931..c44f63d 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/test_driver.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/test_driver.py
@@ -1,13 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2014 All Rights Reserved
-
-*************************************************************
-"""
+# Copyright 2014 IBM Corp.
 import sys
 import mock
 import testtools
diff --git a/nova-powervc/test/nova/driver/virt/powervc/test_startvm.py b/nova-powervc/test/nova/driver/virt/powervc/test_startvm.py
index 976019d..7105850 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/test_startvm.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/test_startvm.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 import mox
diff --git a/nova-powervc/test/nova/driver/virt/powervc/test_stopvm.py b/nova-powervc/test/nova/driver/virt/powervc/test_stopvm.py
index fabd828..c082a3f 100644
--- a/nova-powervc/test/nova/driver/virt/powervc/test_stopvm.py
+++ b/nova-powervc/test/nova/driver/virt/powervc/test_stopvm.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import unittest
 import mox
diff --git a/nova-powervc/test/test_utils.py b/nova-powervc/test/test_utils.py
index e23aed8..4863edb 100644
--- a/nova-powervc/test/test_utils.py
+++ b/nova-powervc/test/test_utils.py
@@ -1,12 +1,4 @@
-COPYRIGHT = """
-*************************************************************
-Licensed Materials - Property of IBM
-
-OCO Source Materials
-
-(C) Copyright IBM Corp. 2013 All Rights Reserved
-*************************************************************
-"""
+# Copyright 2013 IBM Corp.
 
 import testtools
 import powervc.utils as utils_to_test