diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini
index 5a0fc66b6461..893e866b0b32 100644
--- a/etc/nova/api-paste.ini
+++ b/etc/nova/api-paste.ini
@@ -53,7 +53,7 @@ paste.filter_factory = nova.api.ec2:Validator.factory
 paste.app_factory = nova.api.ec2:Executor.factory
 
 #############
-# Openstack #
+# OpenStack #
 #############
 
 [composite:osapi_compute]
diff --git a/nova/tests/cells/test_cells_weights.py b/nova/tests/cells/test_cells_weights.py
index fc46e10279e0..ba4716e623e4 100644
--- a/nova/tests/cells/test_cells_weights.py
+++ b/nova/tests/cells/test_cells_weights.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 Openstack Foundation
+# Copyright (c) 2012 OpenStack Foundation
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 59e68b75dc92..9127231a210a 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -805,7 +805,7 @@ class HostFiltersTestCase(test.NoDBTestCase):
         self.assertTrue(filt_cls.host_passes(host, filter_properties))
 
     def _do_test_compute_filter_extra_specs(self, ecaps, especs, passes):
-        """In real Openstack runtime environment,compute capabilities
+        """In real OpenStack runtime environment,compute capabilities
         value may be number, so we should use number to do unit test.
         """
         self._stub_service_is_up(True)
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
index a3d2769a6bfb..65c257ca4317 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2012 Openstack Foundation
+# Copyright (c) 2012 OpenStack Foundation
 #
 #    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
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe b/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe
index a41acb448e81..6217ef50886b 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/ipxe
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2013 Openstack Foundation
+# Copyright (c) 2013 OpenStack Foundation
 #
 #    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