diff --git a/ICLA/_config.php b/ICLA/_config.php
index eff038c..8fdd132 100644
--- a/ICLA/_config.php
+++ b/ICLA/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/active_records/BatchTask.php b/ICLA/code/infrastructure/active_records/BatchTask.php
index 1c7fd5b..a3d29c7 100644
--- a/ICLA/code/infrastructure/active_records/BatchTask.php
+++ b/ICLA/code/infrastructure/active_records/BatchTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/active_records/ICLACompanyDecorator.php b/ICLA/code/infrastructure/active_records/ICLACompanyDecorator.php
index 42103c0..3bbd9e0 100644
--- a/ICLA/code/infrastructure/active_records/ICLACompanyDecorator.php
+++ b/ICLA/code/infrastructure/active_records/ICLACompanyDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/active_records/ICLAMemberDecorator.php b/ICLA/code/infrastructure/active_records/ICLAMemberDecorator.php
index 0b33ab8..a6e5f34 100644
--- a/ICLA/code/infrastructure/active_records/ICLAMemberDecorator.php
+++ b/ICLA/code/infrastructure/active_records/ICLAMemberDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/active_records/Team.php b/ICLA/code/infrastructure/active_records/Team.php
index 62e13d2..6502318 100644
--- a/ICLA/code/infrastructure/active_records/Team.php
+++ b/ICLA/code/infrastructure/active_records/Team.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/active_records/TeamInvitation.php b/ICLA/code/infrastructure/active_records/TeamInvitation.php
index a1796a8..ba83cb3 100644
--- a/ICLA/code/infrastructure/active_records/TeamInvitation.php
+++ b/ICLA/code/infrastructure/active_records/TeamInvitation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/exceptions/UnauthorizedRestfullAPIException.php b/ICLA/code/infrastructure/exceptions/UnauthorizedRestfullAPIException.php
index 26deee4..074f711 100644
--- a/ICLA/code/infrastructure/exceptions/UnauthorizedRestfullAPIException.php
+++ b/ICLA/code/infrastructure/exceptions/UnauthorizedRestfullAPIException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/factories/BatchTaskFactory.php b/ICLA/code/infrastructure/factories/BatchTaskFactory.php
index 042d502..b707359 100644
--- a/ICLA/code/infrastructure/factories/BatchTaskFactory.php
+++ b/ICLA/code/infrastructure/factories/BatchTaskFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/factories/CCLAValidatorFactory.php b/ICLA/code/infrastructure/factories/CCLAValidatorFactory.php
index 02b8424..5098e5e 100644
--- a/ICLA/code/infrastructure/factories/CCLAValidatorFactory.php
+++ b/ICLA/code/infrastructure/factories/CCLAValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/factories/TeamFactory.php b/ICLA/code/infrastructure/factories/TeamFactory.php
index edf68e8..706b96d 100644
--- a/ICLA/code/infrastructure/factories/TeamFactory.php
+++ b/ICLA/code/infrastructure/factories/TeamFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/factories/TeamInvitationFactory.php b/ICLA/code/infrastructure/factories/TeamInvitationFactory.php
index ff96a01..26c852a 100644
--- a/ICLA/code/infrastructure/factories/TeamInvitationFactory.php
+++ b/ICLA/code/infrastructure/factories/TeamInvitationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/repositories/SapphireBatchTaskRepository.php b/ICLA/code/infrastructure/repositories/SapphireBatchTaskRepository.php
index 208b4f5..bfbec91 100644
--- a/ICLA/code/infrastructure/repositories/SapphireBatchTaskRepository.php
+++ b/ICLA/code/infrastructure/repositories/SapphireBatchTaskRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/repositories/SapphireCLAMemberRepository.php b/ICLA/code/infrastructure/repositories/SapphireCLAMemberRepository.php
index d569504..311959a 100644
--- a/ICLA/code/infrastructure/repositories/SapphireCLAMemberRepository.php
+++ b/ICLA/code/infrastructure/repositories/SapphireCLAMemberRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/repositories/SapphireICLACompanyRepository.php b/ICLA/code/infrastructure/repositories/SapphireICLACompanyRepository.php
index 2ed065e..7b368bd 100644
--- a/ICLA/code/infrastructure/repositories/SapphireICLACompanyRepository.php
+++ b/ICLA/code/infrastructure/repositories/SapphireICLACompanyRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/repositories/SapphireTeamInvitationRepository.php b/ICLA/code/infrastructure/repositories/SapphireTeamInvitationRepository.php
index 9724c58..9c6b948 100644
--- a/ICLA/code/infrastructure/repositories/SapphireTeamInvitationRepository.php
+++ b/ICLA/code/infrastructure/repositories/SapphireTeamInvitationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/repositories/SapphireTeamRepository.php b/ICLA/code/infrastructure/repositories/SapphireTeamRepository.php
index f60cd5d..d224576 100644
--- a/ICLA/code/infrastructure/repositories/SapphireTeamRepository.php
+++ b/ICLA/code/infrastructure/repositories/SapphireTeamRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/services/AbstractRestfulServiceRequestor.php b/ICLA/code/infrastructure/services/AbstractRestfulServiceRequestor.php
index d33da24..4464dd7 100644
--- a/ICLA/code/infrastructure/services/AbstractRestfulServiceRequestor.php
+++ b/ICLA/code/infrastructure/services/AbstractRestfulServiceRequestor.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/services/GerritAPI.php b/ICLA/code/infrastructure/services/GerritAPI.php
index dd55a76..8b3c350 100644
--- a/ICLA/code/infrastructure/services/GerritAPI.php
+++ b/ICLA/code/infrastructure/services/GerritAPI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/services/TeamInvitationEmailSender.php b/ICLA/code/infrastructure/services/TeamInvitationEmailSender.php
index 6732390..b5b3783 100644
--- a/ICLA/code/infrastructure/services/TeamInvitationEmailSender.php
+++ b/ICLA/code/infrastructure/services/TeamInvitationEmailSender.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/tasks/PullCLAFromGerritTask.php b/ICLA/code/infrastructure/tasks/PullCLAFromGerritTask.php
index 711c2f4..f9305d2 100644
--- a/ICLA/code/infrastructure/tasks/PullCLAFromGerritTask.php
+++ b/ICLA/code/infrastructure/tasks/PullCLAFromGerritTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/infrastructure/tasks/UpdateLastCommittedDateTask.php b/ICLA/code/infrastructure/tasks/UpdateLastCommittedDateTask.php
index 863e31d..8cd86ed 100644
--- a/ICLA/code/infrastructure/tasks/UpdateLastCommittedDateTask.php
+++ b/ICLA/code/infrastructure/tasks/UpdateLastCommittedDateTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/interfaces/restfull_api/ICLARestfulAPI.php b/ICLA/code/interfaces/restfull_api/ICLARestfulAPI.php
index aeaa0fe..64a816b 100644
--- a/ICLA/code/interfaces/restfull_api/ICLARestfulAPI.php
+++ b/ICLA/code/interfaces/restfull_api/ICLARestfulAPI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/interfaces/web/TeamInvitationConfirmation_Controller.php b/ICLA/code/interfaces/web/TeamInvitationConfirmation_Controller.php
index 7997b0c..1f28129 100644
--- a/ICLA/code/interfaces/web/TeamInvitationConfirmation_Controller.php
+++ b/ICLA/code/interfaces/web/TeamInvitationConfirmation_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/migrations/CLAICLAGroupsCreationTask.php b/ICLA/code/migrations/CLAICLAGroupsCreationTask.php
index c47eae4..ffccd45 100644
--- a/ICLA/code/migrations/CLAICLAGroupsCreationTask.php
+++ b/ICLA/code/migrations/CLAICLAGroupsCreationTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/CCLACompanyService.php b/ICLA/code/model/CCLACompanyService.php
index 8a1649c..8676004 100644
--- a/ICLA/code/model/CCLACompanyService.php
+++ b/ICLA/code/model/CCLACompanyService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/CCLATeamManager.php b/ICLA/code/model/CCLATeamManager.php
index 10b109a..5153025 100644
--- a/ICLA/code/model/CCLATeamManager.php
+++ b/ICLA/code/model/CCLATeamManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/IBatchTask.php b/ICLA/code/model/IBatchTask.php
index 2d09b5a..d577669 100644
--- a/ICLA/code/model/IBatchTask.php
+++ b/ICLA/code/model/IBatchTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/IBatchTaskFactory.php b/ICLA/code/model/IBatchTaskFactory.php
index 80075c8..90267df 100644
--- a/ICLA/code/model/IBatchTaskFactory.php
+++ b/ICLA/code/model/IBatchTaskFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/IBatchTaskRepository.php b/ICLA/code/model/IBatchTaskRepository.php
index 780e8ef..a4e59a4 100644
--- a/ICLA/code/model/IBatchTaskRepository.php
+++ b/ICLA/code/model/IBatchTaskRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICCLAValidatorFactory.php b/ICLA/code/model/ICCLAValidatorFactory.php
index 5e86690..ca0e6d7 100644
--- a/ICLA/code/model/ICCLAValidatorFactory.php
+++ b/ICLA/code/model/ICCLAValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICLACompany.php b/ICLA/code/model/ICLACompany.php
index 2790619..868a4e2 100644
--- a/ICLA/code/model/ICLACompany.php
+++ b/ICLA/code/model/ICLACompany.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICLACompanyRepository.php b/ICLA/code/model/ICLACompanyRepository.php
index d20d9a8..b8f7b60 100644
--- a/ICLA/code/model/ICLACompanyRepository.php
+++ b/ICLA/code/model/ICLACompanyRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICLAManager.php b/ICLA/code/model/ICLAManager.php
index bee28f5..eaa8528 100644
--- a/ICLA/code/model/ICLAManager.php
+++ b/ICLA/code/model/ICLAManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICLAMember.php b/ICLA/code/model/ICLAMember.php
index 6fb6418..128d5a8 100644
--- a/ICLA/code/model/ICLAMember.php
+++ b/ICLA/code/model/ICLAMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ICLAMemberRepository.php b/ICLA/code/model/ICLAMemberRepository.php
index 2814d9b..0e08b76 100644
--- a/ICLA/code/model/ICLAMemberRepository.php
+++ b/ICLA/code/model/ICLAMemberRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/IGerritAPI.php b/ICLA/code/model/IGerritAPI.php
index 648ab45..34480f2 100644
--- a/ICLA/code/model/IGerritAPI.php
+++ b/ICLA/code/model/IGerritAPI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/IMemberRepository.php b/ICLA/code/model/IMemberRepository.php
index 50db1e5..afc603c 100644
--- a/ICLA/code/model/IMemberRepository.php
+++ b/ICLA/code/model/IMemberRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeam.php b/ICLA/code/model/ITeam.php
index 1e1870a..d877744 100644
--- a/ICLA/code/model/ITeam.php
+++ b/ICLA/code/model/ITeam.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamFactory.php b/ICLA/code/model/ITeamFactory.php
index 6a0c1e8..f0413ce 100644
--- a/ICLA/code/model/ITeamFactory.php
+++ b/ICLA/code/model/ITeamFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamInvitation.php b/ICLA/code/model/ITeamInvitation.php
index 7713473..0e24214 100644
--- a/ICLA/code/model/ITeamInvitation.php
+++ b/ICLA/code/model/ITeamInvitation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamInvitationFactory.php b/ICLA/code/model/ITeamInvitationFactory.php
index d253d33..f6f57d8 100644
--- a/ICLA/code/model/ITeamInvitationFactory.php
+++ b/ICLA/code/model/ITeamInvitationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamInvitationRepository.php b/ICLA/code/model/ITeamInvitationRepository.php
index 7d73800..5226f71 100644
--- a/ICLA/code/model/ITeamInvitationRepository.php
+++ b/ICLA/code/model/ITeamInvitationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamInvitationSender.php b/ICLA/code/model/ITeamInvitationSender.php
index c50265b..54ea50a 100644
--- a/ICLA/code/model/ITeamInvitationSender.php
+++ b/ICLA/code/model/ITeamInvitationSender.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/ITeamRepository.php b/ICLA/code/model/ITeamRepository.php
index c95f353..2adb9c0 100644
--- a/ICLA/code/model/ITeamRepository.php
+++ b/ICLA/code/model/ITeamRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/InvitationDTO.php b/ICLA/code/model/InvitationDTO.php
index f627c7d..12d8af8 100644
--- a/ICLA/code/model/InvitationDTO.php
+++ b/ICLA/code/model/InvitationDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/InviteInfoDTO.php b/ICLA/code/model/InviteInfoDTO.php
index 6810125..58e8afd 100644
--- a/ICLA/code/model/InviteInfoDTO.php
+++ b/ICLA/code/model/InviteInfoDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/InvalidHashInvitationException.php b/ICLA/code/model/exceptions/InvalidHashInvitationException.php
index 731caee..270f5ce 100644
--- a/ICLA/code/model/exceptions/InvalidHashInvitationException.php
+++ b/ICLA/code/model/exceptions/InvalidHashInvitationException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/InvitationAlreadyConfirmedException.php b/ICLA/code/model/exceptions/InvitationAlreadyConfirmedException.php
index d4fd000..7887a5e 100644
--- a/ICLA/code/model/exceptions/InvitationAlreadyConfirmedException.php
+++ b/ICLA/code/model/exceptions/InvitationAlreadyConfirmedException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/InvitationBelongsToAnotherMemberException.php b/ICLA/code/model/exceptions/InvitationBelongsToAnotherMemberException.php
index 940a80b..2ae1ecf 100644
--- a/ICLA/code/model/exceptions/InvitationBelongsToAnotherMemberException.php
+++ b/ICLA/code/model/exceptions/InvitationBelongsToAnotherMemberException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/MemberNotSignedCCLAException.php b/ICLA/code/model/exceptions/MemberNotSignedCCLAException.php
index a0da9c9..6fabfd9 100644
--- a/ICLA/code/model/exceptions/MemberNotSignedCCLAException.php
+++ b/ICLA/code/model/exceptions/MemberNotSignedCCLAException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/TeamAlreadyExistsException.php b/ICLA/code/model/exceptions/TeamAlreadyExistsException.php
index 1aa7f0b..37ba3cf 100644
--- a/ICLA/code/model/exceptions/TeamAlreadyExistsException.php
+++ b/ICLA/code/model/exceptions/TeamAlreadyExistsException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/model/exceptions/TeamMemberAlreadyExistsException.php b/ICLA/code/model/exceptions/TeamMemberAlreadyExistsException.php
index 3514f10..bcc0d3d 100644
--- a/ICLA/code/model/exceptions/TeamMemberAlreadyExistsException.php
+++ b/ICLA/code/model/exceptions/TeamMemberAlreadyExistsException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/ui/admin/SangriaPageICLACompaniesExtension.php b/ICLA/code/ui/admin/SangriaPageICLACompaniesExtension.php
index 3330e89..85e5c9b 100644
--- a/ICLA/code/ui/admin/SangriaPageICLACompaniesExtension.php
+++ b/ICLA/code/ui/admin/SangriaPageICLACompaniesExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/ui/frontend/EditProfilePageICLAExtension.php b/ICLA/code/ui/frontend/EditProfilePageICLAExtension.php
index e8a6fca..c7c0afe 100644
--- a/ICLA/code/ui/frontend/EditProfilePageICLAExtension.php
+++ b/ICLA/code/ui/frontend/EditProfilePageICLAExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/code/ui/frontend/TeamMemberViewModel.php b/ICLA/code/ui/frontend/TeamMemberViewModel.php
index a0fdd21..093d586 100644
--- a/ICLA/code/ui/frontend/TeamMemberViewModel.php
+++ b/ICLA/code/ui/frontend/TeamMemberViewModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/js/edit.profile.ccla.teams.js b/ICLA/js/edit.profile.ccla.teams.js
index f68f94f..b5baf65 100644
--- a/ICLA/js/edit.profile.ccla.teams.js
+++ b/ICLA/js/edit.profile.ccla.teams.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/js/sangia.ccla.companies.js b/ICLA/js/sangia.ccla.companies.js
index 6b1d507..69e213e 100644
--- a/ICLA/js/sangia.ccla.companies.js
+++ b/ICLA/js/sangia.ccla.companies.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/ICLA/tests/ICLAManagerTest.php b/ICLA/tests/ICLAManagerTest.php
index d385629..d3880b7 100644
--- a/ICLA/tests/ICLAManagerTest.php
+++ b/ICLA/tests/ICLAManagerTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/_config.php b/change_password/_config.php
index da1cbb5..6564043 100644
--- a/change_password/_config.php
+++ b/change_password/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/CustomMember_ForgotPasswordEmail.php b/change_password/code/model/CustomMember_ForgotPasswordEmail.php
index 5b66a08..fabc8d7 100644
--- a/change_password/code/model/CustomMember_ForgotPasswordEmail.php
+++ b/change_password/code/model/CustomMember_ForgotPasswordEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/PasswordManager.php b/change_password/code/model/PasswordManager.php
index 917a0d2..3a55ad9 100644
--- a/change_password/code/model/PasswordManager.php
+++ b/change_password/code/model/PasswordManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/exceptions/EmptyPasswordException.php b/change_password/code/model/exceptions/EmptyPasswordException.php
index a15c115..83cf7cc 100644
--- a/change_password/code/model/exceptions/EmptyPasswordException.php
+++ b/change_password/code/model/exceptions/EmptyPasswordException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/exceptions/InvalidPasswordException.php b/change_password/code/model/exceptions/InvalidPasswordException.php
index 466c4bc..0c60619 100644
--- a/change_password/code/model/exceptions/InvalidPasswordException.php
+++ b/change_password/code/model/exceptions/InvalidPasswordException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/exceptions/InvalidPasswordResetLinkException.php b/change_password/code/model/exceptions/InvalidPasswordResetLinkException.php
index eab5baa..be79088 100644
--- a/change_password/code/model/exceptions/InvalidPasswordResetLinkException.php
+++ b/change_password/code/model/exceptions/InvalidPasswordResetLinkException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/exceptions/InvalidResetPasswordTokenException.php b/change_password/code/model/exceptions/InvalidResetPasswordTokenException.php
index d4d7bd1..6b264b2 100644
--- a/change_password/code/model/exceptions/InvalidResetPasswordTokenException.php
+++ b/change_password/code/model/exceptions/InvalidResetPasswordTokenException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/model/exceptions/PasswordMismatchException.php b/change_password/code/model/exceptions/PasswordMismatchException.php
index ba340d0..a8bda1c 100644
--- a/change_password/code/model/exceptions/PasswordMismatchException.php
+++ b/change_password/code/model/exceptions/PasswordMismatchException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/ui/CustomChangePasswordForm.php b/change_password/code/ui/CustomChangePasswordForm.php
index 422a7d1..524ed18 100644
--- a/change_password/code/ui/CustomChangePasswordForm.php
+++ b/change_password/code/ui/CustomChangePasswordForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/change_password/code/ui/CustomPasswordController.php b/change_password/code/ui/CustomPasswordController.php
index 9b84c05..aa19e9b 100644
--- a/change_password/code/ui/CustomPasswordController.php
+++ b/change_password/code/ui/CustomPasswordController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/datepicker/_config.php b/datepicker/_config.php
index b205bb9..49df8f6 100644
--- a/datepicker/_config.php
+++ b/datepicker/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/datepicker/code/JQueryUIDatePickerField.php b/datepicker/code/JQueryUIDatePickerField.php
index 0b62021..8b0ff92 100644
--- a/datepicker/code/JQueryUIDatePickerField.php
+++ b/datepicker/code/JQueryUIDatePickerField.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/datepicker/javascript/datepicker.js b/datepicker/javascript/datepicker.js
index 287c46e..748ad90 100644
--- a/datepicker/javascript/datepicker.js
+++ b/datepicker/javascript/datepicker.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/_config.php b/elections/_config.php
index fc0671f..8ccd2a5 100644
--- a/elections/_config.php
+++ b/elections/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/active_records/Election.php b/elections/code/infrastructure/active_records/Election.php
index 90a2e84..2d2946d 100644
--- a/elections/code/infrastructure/active_records/Election.php
+++ b/elections/code/infrastructure/active_records/Election.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/active_records/FoundationMember.php b/elections/code/infrastructure/active_records/FoundationMember.php
index 62caa7d..00c9166 100644
--- a/elections/code/infrastructure/active_records/FoundationMember.php
+++ b/elections/code/infrastructure/active_records/FoundationMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/active_records/FoundationMemberRevocationNotification.php b/elections/code/infrastructure/active_records/FoundationMemberRevocationNotification.php
index d0c6f74..9676338 100644
--- a/elections/code/infrastructure/active_records/FoundationMemberRevocationNotification.php
+++ b/elections/code/infrastructure/active_records/FoundationMemberRevocationNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/active_records/Vote.php b/elections/code/infrastructure/active_records/Vote.php
index b597359..7b8cf52 100644
--- a/elections/code/infrastructure/active_records/Vote.php
+++ b/elections/code/infrastructure/active_records/Vote.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/active_records/VoterFile.php b/elections/code/infrastructure/active_records/VoterFile.php
index 007eb97..ee17561 100644
--- a/elections/code/infrastructure/active_records/VoterFile.php
+++ b/elections/code/infrastructure/active_records/VoterFile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/factories/ElectionFactory.php b/elections/code/infrastructure/factories/ElectionFactory.php
index 47c54d5..26a8fcd 100644
--- a/elections/code/infrastructure/factories/ElectionFactory.php
+++ b/elections/code/infrastructure/factories/ElectionFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/factories/RevocationNotificationFactory.php b/elections/code/infrastructure/factories/RevocationNotificationFactory.php
index 2481a84..58fe232 100644
--- a/elections/code/infrastructure/factories/RevocationNotificationFactory.php
+++ b/elections/code/infrastructure/factories/RevocationNotificationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/factories/VoteFactory.php b/elections/code/infrastructure/factories/VoteFactory.php
index 23eafd2..16955ba 100644
--- a/elections/code/infrastructure/factories/VoteFactory.php
+++ b/elections/code/infrastructure/factories/VoteFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/factories/VoterFileFactory.php b/elections/code/infrastructure/factories/VoterFileFactory.php
index fffe3f5..98bb0bb 100644
--- a/elections/code/infrastructure/factories/VoterFileFactory.php
+++ b/elections/code/infrastructure/factories/VoterFileFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/repositories/SapphireElectionRepository.php b/elections/code/infrastructure/repositories/SapphireElectionRepository.php
index 88f49f9..f75169d 100644
--- a/elections/code/infrastructure/repositories/SapphireElectionRepository.php
+++ b/elections/code/infrastructure/repositories/SapphireElectionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/repositories/SapphireFoundationMemberRepository.php b/elections/code/infrastructure/repositories/SapphireFoundationMemberRepository.php
index 473ade2..2b5b38d 100644
--- a/elections/code/infrastructure/repositories/SapphireFoundationMemberRepository.php
+++ b/elections/code/infrastructure/repositories/SapphireFoundationMemberRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/repositories/SapphireFoundationMemberRevocationNotificationRepository.php b/elections/code/infrastructure/repositories/SapphireFoundationMemberRevocationNotificationRepository.php
index e240e07..5958725 100644
--- a/elections/code/infrastructure/repositories/SapphireFoundationMemberRevocationNotificationRepository.php
+++ b/elections/code/infrastructure/repositories/SapphireFoundationMemberRevocationNotificationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/repositories/SapphireVoteRepository.php b/elections/code/infrastructure/repositories/SapphireVoteRepository.php
index 9d4c867..0d8b531 100644
--- a/elections/code/infrastructure/repositories/SapphireVoteRepository.php
+++ b/elections/code/infrastructure/repositories/SapphireVoteRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/repositories/SapphireVoterFileRepository.php b/elections/code/infrastructure/repositories/SapphireVoterFileRepository.php
index cee3e3d..877a968 100644
--- a/elections/code/infrastructure/repositories/SapphireVoterFileRepository.php
+++ b/elections/code/infrastructure/repositories/SapphireVoterFileRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/services/RevocationNotificationEmailSender.php b/elections/code/infrastructure/services/RevocationNotificationEmailSender.php
index 6182200..af96892 100644
--- a/elections/code/infrastructure/services/RevocationNotificationEmailSender.php
+++ b/elections/code/infrastructure/services/RevocationNotificationEmailSender.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/tasks/RevocationExecutorTask.php b/elections/code/infrastructure/tasks/RevocationExecutorTask.php
index 68be0fd..4bbec2b 100644
--- a/elections/code/infrastructure/tasks/RevocationExecutorTask.php
+++ b/elections/code/infrastructure/tasks/RevocationExecutorTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/tasks/RevocationNotificationSenderTask.php b/elections/code/infrastructure/tasks/RevocationNotificationSenderTask.php
index ab6300c..85d4e82 100644
--- a/elections/code/infrastructure/tasks/RevocationNotificationSenderTask.php
+++ b/elections/code/infrastructure/tasks/RevocationNotificationSenderTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/infrastructure/tasks/VotersDataIngestionTask.php b/elections/code/infrastructure/tasks/VotersDataIngestionTask.php
index b9054cf..8dd7b25 100644
--- a/elections/code/infrastructure/tasks/VotersDataIngestionTask.php
+++ b/elections/code/infrastructure/tasks/VotersDataIngestionTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/migrations/ElectionMigrationTask.php b/elections/code/migrations/ElectionMigrationTask.php
index 8c713fc..1b01d35 100644
--- a/elections/code/migrations/ElectionMigrationTask.php
+++ b/elections/code/migrations/ElectionMigrationTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/ElectionManager.php b/elections/code/model/ElectionManager.php
index 3f9bb90..17cd5b5 100644
--- a/elections/code/model/ElectionManager.php
+++ b/elections/code/model/ElectionManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/FoundationMemberManager.php b/elections/code/model/FoundationMemberManager.php
index 59e75a1..022ab31 100644
--- a/elections/code/model/FoundationMemberManager.php
+++ b/elections/code/model/FoundationMemberManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/FoundationMembershipRevocationSpecification.php b/elections/code/model/FoundationMembershipRevocationSpecification.php
index df890eb..5974ea9 100644
--- a/elections/code/model/FoundationMembershipRevocationSpecification.php
+++ b/elections/code/model/FoundationMembershipRevocationSpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/ICommunityMember.php b/elections/code/model/ICommunityMember.php
index 06d4ce5..8194ec0 100644
--- a/elections/code/model/ICommunityMember.php
+++ b/elections/code/model/ICommunityMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IElection.php b/elections/code/model/IElection.php
index c648a8a..c203bc6 100644
--- a/elections/code/model/IElection.php
+++ b/elections/code/model/IElection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IElectionFactory.php b/elections/code/model/IElectionFactory.php
index 67eb597..0bff210 100644
--- a/elections/code/model/IElectionFactory.php
+++ b/elections/code/model/IElectionFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IElectionRepository.php b/elections/code/model/IElectionRepository.php
index 576d9f0..027912e 100644
--- a/elections/code/model/IElectionRepository.php
+++ b/elections/code/model/IElectionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IFoundationMember.php b/elections/code/model/IFoundationMember.php
index b6de356..5e2b33b 100644
--- a/elections/code/model/IFoundationMember.php
+++ b/elections/code/model/IFoundationMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IFoundationMemberRepository.php b/elections/code/model/IFoundationMemberRepository.php
index cc5c61a..41d5788 100644
--- a/elections/code/model/IFoundationMemberRepository.php
+++ b/elections/code/model/IFoundationMemberRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IFoundationMemberRevocationNotification.php b/elections/code/model/IFoundationMemberRevocationNotification.php
index 49f955c..4713096 100644
--- a/elections/code/model/IFoundationMemberRevocationNotification.php
+++ b/elections/code/model/IFoundationMemberRevocationNotification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IFoundationMemberRevocationNotificationFactory.php b/elections/code/model/IFoundationMemberRevocationNotificationFactory.php
index 106e0d1..bd18418 100644
--- a/elections/code/model/IFoundationMemberRevocationNotificationFactory.php
+++ b/elections/code/model/IFoundationMemberRevocationNotificationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IFoundationMemberRevocationNotificationRepository.php b/elections/code/model/IFoundationMemberRevocationNotificationRepository.php
index 3078bc6..e1c7c03 100644
--- a/elections/code/model/IFoundationMemberRevocationNotificationRepository.php
+++ b/elections/code/model/IFoundationMemberRevocationNotificationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IRevocationNotificationSender.php b/elections/code/model/IRevocationNotificationSender.php
index 9ef1aad..ec04f2a 100644
--- a/elections/code/model/IRevocationNotificationSender.php
+++ b/elections/code/model/IRevocationNotificationSender.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVote.php b/elections/code/model/IVote.php
index 029e76a..dd04cea 100644
--- a/elections/code/model/IVote.php
+++ b/elections/code/model/IVote.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVoteFactory.php b/elections/code/model/IVoteFactory.php
index 2ad785a..5694ecc 100644
--- a/elections/code/model/IVoteFactory.php
+++ b/elections/code/model/IVoteFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVoteRepository.php b/elections/code/model/IVoteRepository.php
index dfcb017..0267c42 100644
--- a/elections/code/model/IVoteRepository.php
+++ b/elections/code/model/IVoteRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVoterFile.php b/elections/code/model/IVoterFile.php
index a44d926..f8cadc7 100644
--- a/elections/code/model/IVoterFile.php
+++ b/elections/code/model/IVoterFile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVoterFileFactory.php b/elections/code/model/IVoterFileFactory.php
index c8572c2..86111c3 100644
--- a/elections/code/model/IVoterFileFactory.php
+++ b/elections/code/model/IVoterFileFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/IVoterFileRepository.php b/elections/code/model/IVoterFileRepository.php
index 6001ff5..67e9317 100644
--- a/elections/code/model/IVoterFileRepository.php
+++ b/elections/code/model/IVoterFileRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/model/RevocationNotificationManager.php b/elections/code/model/RevocationNotificationManager.php
index cae03c0..efd0149 100644
--- a/elections/code/model/RevocationNotificationManager.php
+++ b/elections/code/model/RevocationNotificationManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/elections/code/ui/frontend/RevocationNotificationAction_Controller.php b/elections/code/ui/frontend/RevocationNotificationAction_Controller.php
index 0807b19..d21087e 100644
--- a/elections/code/ui/frontend/RevocationNotificationAction_Controller.php
+++ b/elections/code/ui/frontend/RevocationNotificationAction_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/_config.php b/events/_config.php
index 40e0eaf..8dcb4cd 100644
--- a/events/_config.php
+++ b/events/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/application/assemblers/EventsAssembler.php b/events/code/application/assemblers/EventsAssembler.php
index 8fb897f..b9aa95f 100644
--- a/events/code/application/assemblers/EventsAssembler.php
+++ b/events/code/application/assemblers/EventsAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/active_records/EventAlertEmail.php b/events/code/infrastructure/active_records/EventAlertEmail.php
index 2776afe..c959775 100644
--- a/events/code/infrastructure/active_records/EventAlertEmail.php
+++ b/events/code/infrastructure/active_records/EventAlertEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/active_records/EventRegistrationRequest.php b/events/code/infrastructure/active_records/EventRegistrationRequest.php
index eb910df..6e6d7f6 100644
--- a/events/code/infrastructure/active_records/EventRegistrationRequest.php
+++ b/events/code/infrastructure/active_records/EventRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/factories/EventRegistrationRequestFactory.php b/events/code/infrastructure/factories/EventRegistrationRequestFactory.php
index af48799..9749319 100644
--- a/events/code/infrastructure/factories/EventRegistrationRequestFactory.php
+++ b/events/code/infrastructure/factories/EventRegistrationRequestFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/factories/EventValidatorFactory.php b/events/code/infrastructure/factories/EventValidatorFactory.php
index 262fb4b..a84cd43 100644
--- a/events/code/infrastructure/factories/EventValidatorFactory.php
+++ b/events/code/infrastructure/factories/EventValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/repositories/SapphireEventAlertEmailRepository.php b/events/code/infrastructure/repositories/SapphireEventAlertEmailRepository.php
index 1ebd423..b4d7869 100644
--- a/events/code/infrastructure/repositories/SapphireEventAlertEmailRepository.php
+++ b/events/code/infrastructure/repositories/SapphireEventAlertEmailRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/repositories/SapphireEventRegistrationRequestRepository.php b/events/code/infrastructure/repositories/SapphireEventRegistrationRequestRepository.php
index da19ba8..88a3544 100644
--- a/events/code/infrastructure/repositories/SapphireEventRegistrationRequestRepository.php
+++ b/events/code/infrastructure/repositories/SapphireEventRegistrationRequestRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/repositories/SapphireEventRepository.php b/events/code/infrastructure/repositories/SapphireEventRepository.php
index 3a838bd..a417dec 100644
--- a/events/code/infrastructure/repositories/SapphireEventRepository.php
+++ b/events/code/infrastructure/repositories/SapphireEventRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/services/SapphireEventPublishingService.php b/events/code/infrastructure/services/SapphireEventPublishingService.php
index 3f093f9..e6a0321 100644
--- a/events/code/infrastructure/services/SapphireEventPublishingService.php
+++ b/events/code/infrastructure/services/SapphireEventPublishingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/infrastructure/tasks/EventRegistrationRequestDigestTask.php b/events/code/infrastructure/tasks/EventRegistrationRequestDigestTask.php
index 187ab77..72185c2 100644
--- a/events/code/infrastructure/tasks/EventRegistrationRequestDigestTask.php
+++ b/events/code/infrastructure/tasks/EventRegistrationRequestDigestTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/interfaces/restfull_api/EventRegistrationRequestCrudApi.php b/events/code/interfaces/restfull_api/EventRegistrationRequestCrudApi.php
index 90f489e..fde4e5d 100644
--- a/events/code/interfaces/restfull_api/EventRegistrationRequestCrudApi.php
+++ b/events/code/interfaces/restfull_api/EventRegistrationRequestCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventAlertEmailManager.php b/events/code/model/EventAlertEmailManager.php
index 1627896..ae75add 100644
--- a/events/code/model/EventAlertEmailManager.php
+++ b/events/code/model/EventAlertEmailManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventDuration.php b/events/code/model/EventDuration.php
index 663f87e..081e50b 100644
--- a/events/code/model/EventDuration.php
+++ b/events/code/model/EventDuration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventLocation.php b/events/code/model/EventLocation.php
index ffd72bc..de4ee75 100644
--- a/events/code/model/EventLocation.php
+++ b/events/code/model/EventLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventMainInfo.php b/events/code/model/EventMainInfo.php
index 4ae0264..5e9a819 100644
--- a/events/code/model/EventMainInfo.php
+++ b/events/code/model/EventMainInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventPointOfContact.php b/events/code/model/EventPointOfContact.php
index f8f5e50..cf780de 100644
--- a/events/code/model/EventPointOfContact.php
+++ b/events/code/model/EventPointOfContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/EventRegistrationRequestManager.php b/events/code/model/EventRegistrationRequestManager.php
index bd89832..8fa176b 100644
--- a/events/code/model/EventRegistrationRequestManager.php
+++ b/events/code/model/EventRegistrationRequestManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEvent.php b/events/code/model/IEvent.php
index 567fd1d..42aeb58 100644
--- a/events/code/model/IEvent.php
+++ b/events/code/model/IEvent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventAlertEmail.php b/events/code/model/IEventAlertEmail.php
index ef90625..2e17720 100644
--- a/events/code/model/IEventAlertEmail.php
+++ b/events/code/model/IEventAlertEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventAlertEmailRepository.php b/events/code/model/IEventAlertEmailRepository.php
index 23aa998..ded7d17 100644
--- a/events/code/model/IEventAlertEmailRepository.php
+++ b/events/code/model/IEventAlertEmailRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventPublishingService.php b/events/code/model/IEventPublishingService.php
index 5ad7ae0..bc9c6fb 100644
--- a/events/code/model/IEventPublishingService.php
+++ b/events/code/model/IEventPublishingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventRegistrationRequest.php b/events/code/model/IEventRegistrationRequest.php
index 2e0c389..6ea246f 100644
--- a/events/code/model/IEventRegistrationRequest.php
+++ b/events/code/model/IEventRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventRegistrationRequestFactory.php b/events/code/model/IEventRegistrationRequestFactory.php
index d98fcb9..ed605e3 100644
--- a/events/code/model/IEventRegistrationRequestFactory.php
+++ b/events/code/model/IEventRegistrationRequestFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventRegistrationRequestRepository.php b/events/code/model/IEventRegistrationRequestRepository.php
index 1a9c1d1..497ab11 100644
--- a/events/code/model/IEventRegistrationRequestRepository.php
+++ b/events/code/model/IEventRegistrationRequestRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/IEventValidatorFactory.php b/events/code/model/IEventValidatorFactory.php
index cd1fd2c..aecc6b1 100644
--- a/events/code/model/IEventValidatorFactory.php
+++ b/events/code/model/IEventValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/model/SponsorInfo.php b/events/code/model/SponsorInfo.php
index 1d35a31..e48d30e 100644
--- a/events/code/model/SponsorInfo.php
+++ b/events/code/model/SponsorInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/ui/EventHolder.php b/events/code/ui/EventHolder.php
index 9cbbdcf..fabbd3b 100755
--- a/events/code/ui/EventHolder.php
+++ b/events/code/ui/EventHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/ui/EventPage.php b/events/code/ui/EventPage.php
index 4d220a4..1a12673 100755
--- a/events/code/ui/EventPage.php
+++ b/events/code/ui/EventPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/ui/admin/SangriaPageEventExtension.php b/events/code/ui/admin/SangriaPageEventExtension.php
index 9671cae..fddf16f 100644
--- a/events/code/ui/admin/SangriaPageEventExtension.php
+++ b/events/code/ui/admin/SangriaPageEventExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/ui/frontend/EventRegistrationRequestForm.php b/events/code/ui/frontend/EventRegistrationRequestForm.php
index a029836..8157624 100644
--- a/events/code/ui/frontend/EventRegistrationRequestForm.php
+++ b/events/code/ui/frontend/EventRegistrationRequestForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/code/ui/frontend/EventRegistrationRequestPage.php b/events/code/ui/frontend/EventRegistrationRequestPage.php
index f2fdcf5..733b02b 100644
--- a/events/code/ui/frontend/EventRegistrationRequestPage.php
+++ b/events/code/ui/frontend/EventRegistrationRequestPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/js/admin/sangria.page.event.extension.js b/events/js/admin/sangria.page.event.extension.js
index 8659232..0c61c7a 100644
--- a/events/js/admin/sangria.page.event.extension.js
+++ b/events/js/admin/sangria.page.event.extension.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/js/event.registration.form.js b/events/js/event.registration.form.js
index fc8e3b1..584c05d 100644
--- a/events/js/event.registration.form.js
+++ b/events/js/event.registration.form.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/js/event.registration.request.page.js b/events/js/event.registration.request.page.js
index eaa161f..9dd508a 100644
--- a/events/js/event.registration.request.page.js
+++ b/events/js/event.registration.request.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/events/js/events.js b/events/js/events.js
index cff8351..702934c 100644
--- a/events/js/events.js
+++ b/events/js/events.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/feeds/FeedForAll_XMLParser.inc.php b/feeds/FeedForAll_XMLParser.inc.php
index 36eee2a..c4d6b64 100644
--- a/feeds/FeedForAll_XMLParser.inc.php
+++ b/feeds/FeedForAll_XMLParser.inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/feeds/developer-activity.php b/feeds/developer-activity.php
index 0c67983..25abd1f 100644
--- a/feeds/developer-activity.php
+++ b/feeds/developer-activity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/feeds/openstack.php b/feeds/openstack.php
index c7ffdc5..f328bf9 100644
--- a/feeds/openstack.php
+++ b/feeds/openstack.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/form_html_purifier/_config.php b/form_html_purifier/_config.php
index b205bb9..49df8f6 100644
--- a/form_html_purifier/_config.php
+++ b/form_html_purifier/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/form_html_purifier/code/SafeXSSForm.php b/form_html_purifier/code/SafeXSSForm.php
index d269a3a..c300fc6 100644
--- a/form_html_purifier/code/SafeXSSForm.php
+++ b/form_html_purifier/code/SafeXSSForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/_config.php b/jobs/_config.php
index 65eda2d..748e7a6 100644
--- a/jobs/_config.php
+++ b/jobs/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/application/assemblers/JobsAssembler.php b/jobs/code/application/assemblers/JobsAssembler.php
index 44a84c0..b521d52 100644
--- a/jobs/code/application/assemblers/JobsAssembler.php
+++ b/jobs/code/application/assemblers/JobsAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/active_records/JobAlertEmail.php b/jobs/code/infrastructure/active_records/JobAlertEmail.php
index 310653e..fd79a5e 100644
--- a/jobs/code/infrastructure/active_records/JobAlertEmail.php
+++ b/jobs/code/infrastructure/active_records/JobAlertEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/active_records/JobLocation.php b/jobs/code/infrastructure/active_records/JobLocation.php
index 0ff251c..2b0170d 100644
--- a/jobs/code/infrastructure/active_records/JobLocation.php
+++ b/jobs/code/infrastructure/active_records/JobLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/active_records/JobPage.php b/jobs/code/infrastructure/active_records/JobPage.php
index efbb0f6..3e313d6 100644
--- a/jobs/code/infrastructure/active_records/JobPage.php
+++ b/jobs/code/infrastructure/active_records/JobPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/active_records/JobRegistrationRequest.php b/jobs/code/infrastructure/active_records/JobRegistrationRequest.php
index 849edfe..18bd0ce 100644
--- a/jobs/code/infrastructure/active_records/JobRegistrationRequest.php
+++ b/jobs/code/infrastructure/active_records/JobRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/factories/JobFactory.php b/jobs/code/infrastructure/factories/JobFactory.php
index a8070a3..a2ab18f 100644
--- a/jobs/code/infrastructure/factories/JobFactory.php
+++ b/jobs/code/infrastructure/factories/JobFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/factories/JobsValidationFactory.php b/jobs/code/infrastructure/factories/JobsValidationFactory.php
index 8f19de1..1d98225 100644
--- a/jobs/code/infrastructure/factories/JobsValidationFactory.php
+++ b/jobs/code/infrastructure/factories/JobsValidationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/queries/CompaniesNamesQueryHandler.php b/jobs/code/infrastructure/queries/CompaniesNamesQueryHandler.php
index efea87d..a0674ea 100644
--- a/jobs/code/infrastructure/queries/CompaniesNamesQueryHandler.php
+++ b/jobs/code/infrastructure/queries/CompaniesNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/repositories/SapphireJobAlertEmailRepository.php b/jobs/code/infrastructure/repositories/SapphireJobAlertEmailRepository.php
index 4083f0a..7720603 100644
--- a/jobs/code/infrastructure/repositories/SapphireJobAlertEmailRepository.php
+++ b/jobs/code/infrastructure/repositories/SapphireJobAlertEmailRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/repositories/SapphireJobRegistrationRequestRepository.php b/jobs/code/infrastructure/repositories/SapphireJobRegistrationRequestRepository.php
index fb2031b..aef46c4 100644
--- a/jobs/code/infrastructure/repositories/SapphireJobRegistrationRequestRepository.php
+++ b/jobs/code/infrastructure/repositories/SapphireJobRegistrationRequestRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/repositories/SapphireJobRepository.php b/jobs/code/infrastructure/repositories/SapphireJobRepository.php
index d5282b9..173a46c 100644
--- a/jobs/code/infrastructure/repositories/SapphireJobRepository.php
+++ b/jobs/code/infrastructure/repositories/SapphireJobRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/services/SapphireJobPublishingService.php b/jobs/code/infrastructure/services/SapphireJobPublishingService.php
index 3e032dd..5b9bcc2 100644
--- a/jobs/code/infrastructure/services/SapphireJobPublishingService.php
+++ b/jobs/code/infrastructure/services/SapphireJobPublishingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/tasks/JobRegistrationRequestDigestTask.php b/jobs/code/infrastructure/tasks/JobRegistrationRequestDigestTask.php
index 6d053d1..4ac0c6d 100644
--- a/jobs/code/infrastructure/tasks/JobRegistrationRequestDigestTask.php
+++ b/jobs/code/infrastructure/tasks/JobRegistrationRequestDigestTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/infrastructure/tasks/JobRegistrationRequestPurgeTask.php b/jobs/code/infrastructure/tasks/JobRegistrationRequestPurgeTask.php
index d83b6f3..9127655 100644
--- a/jobs/code/infrastructure/tasks/JobRegistrationRequestPurgeTask.php
+++ b/jobs/code/infrastructure/tasks/JobRegistrationRequestPurgeTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/interfaces/restfull_api/JobRegistrationRequestCrudApi.php b/jobs/code/interfaces/restfull_api/JobRegistrationRequestCrudApi.php
index ae4afa6..6e42729 100644
--- a/jobs/code/interfaces/restfull_api/JobRegistrationRequestCrudApi.php
+++ b/jobs/code/interfaces/restfull_api/JobRegistrationRequestCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/migrations/JobUpdateLocations.php b/jobs/code/migrations/JobUpdateLocations.php
index 1ebb813..b8c160a 100644
--- a/jobs/code/migrations/JobUpdateLocations.php
+++ b/jobs/code/migrations/JobUpdateLocations.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/migrations/JobUpdateTask.php b/jobs/code/migrations/JobUpdateTask.php
index 149fccc..df220eb 100644
--- a/jobs/code/migrations/JobUpdateTask.php
+++ b/jobs/code/migrations/JobUpdateTask.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IAlertEmailRepository.php b/jobs/code/model/IAlertEmailRepository.php
index 95c685e..9b90033 100644
--- a/jobs/code/model/IAlertEmailRepository.php
+++ b/jobs/code/model/IAlertEmailRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJob.php b/jobs/code/model/IJob.php
index c99c9c5..c9ed996 100644
--- a/jobs/code/model/IJob.php
+++ b/jobs/code/model/IJob.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobAlertEmail.php b/jobs/code/model/IJobAlertEmail.php
index 99a1db1..87c1dfe 100644
--- a/jobs/code/model/IJobAlertEmail.php
+++ b/jobs/code/model/IJobAlertEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobFactory.php b/jobs/code/model/IJobFactory.php
index 5284653..e23395b 100644
--- a/jobs/code/model/IJobFactory.php
+++ b/jobs/code/model/IJobFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobLocation.php b/jobs/code/model/IJobLocation.php
index 9460731..1a48ca4 100644
--- a/jobs/code/model/IJobLocation.php
+++ b/jobs/code/model/IJobLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobPublishingService.php b/jobs/code/model/IJobPublishingService.php
index f0cba9f..fec512a 100644
--- a/jobs/code/model/IJobPublishingService.php
+++ b/jobs/code/model/IJobPublishingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobRegistrationRequest.php b/jobs/code/model/IJobRegistrationRequest.php
index 901b346..b5ef9c3 100644
--- a/jobs/code/model/IJobRegistrationRequest.php
+++ b/jobs/code/model/IJobRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobRegistrationRequestRepository.php b/jobs/code/model/IJobRegistrationRequestRepository.php
index a4efc74..525698b 100644
--- a/jobs/code/model/IJobRegistrationRequestRepository.php
+++ b/jobs/code/model/IJobRegistrationRequestRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/IJobsValidationFactory.php b/jobs/code/model/IJobsValidationFactory.php
index e328e88..10976c9 100644
--- a/jobs/code/model/IJobsValidationFactory.php
+++ b/jobs/code/model/IJobsValidationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/JobLocation.php b/jobs/code/model/JobLocation.php
index bff88b1..3692e1c 100644
--- a/jobs/code/model/JobLocation.php
+++ b/jobs/code/model/JobLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/JobMainInfo.php b/jobs/code/model/JobMainInfo.php
index 8eb3cf8..e70c6ef 100644
--- a/jobs/code/model/JobMainInfo.php
+++ b/jobs/code/model/JobMainInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/JobPointOfContact.php b/jobs/code/model/JobPointOfContact.php
index 63f0e85..a643b6d 100644
--- a/jobs/code/model/JobPointOfContact.php
+++ b/jobs/code/model/JobPointOfContact.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/model/JobRegistrationRequestManager.php b/jobs/code/model/JobRegistrationRequestManager.php
index 7bd9f1a..04cd35b 100644
--- a/jobs/code/model/JobRegistrationRequestManager.php
+++ b/jobs/code/model/JobRegistrationRequestManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/ui/admin/SangriaPageJobsExtension.php b/jobs/code/ui/admin/SangriaPageJobsExtension.php
index 72a2efc..78479d7 100644
--- a/jobs/code/ui/admin/SangriaPageJobsExtension.php
+++ b/jobs/code/ui/admin/SangriaPageJobsExtension.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/ui/frontend/JobHolder.php b/jobs/code/ui/frontend/JobHolder.php
index a2bdd27..1dbec76 100644
--- a/jobs/code/ui/frontend/JobHolder.php
+++ b/jobs/code/ui/frontend/JobHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/ui/frontend/JobPage_Controller.php b/jobs/code/ui/frontend/JobPage_Controller.php
index 5cb9bf3..ac782f5 100644
--- a/jobs/code/ui/frontend/JobPage_Controller.php
+++ b/jobs/code/ui/frontend/JobPage_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/ui/frontend/JobRegistrationRequestForm.php b/jobs/code/ui/frontend/JobRegistrationRequestForm.php
index b847c08..108b5d4 100644
--- a/jobs/code/ui/frontend/JobRegistrationRequestForm.php
+++ b/jobs/code/ui/frontend/JobRegistrationRequestForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/code/ui/frontend/JobRegistrationRequestPage.php b/jobs/code/ui/frontend/JobRegistrationRequestPage.php
index e4d1195..7af9a0f 100644
--- a/jobs/code/ui/frontend/JobRegistrationRequestPage.php
+++ b/jobs/code/ui/frontend/JobRegistrationRequestPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/js/admin/sangria.page.job.extension.js b/jobs/js/admin/sangria.page.job.extension.js
index 7a92ed0..e663212 100644
--- a/jobs/js/admin/sangria.page.job.extension.js
+++ b/jobs/js/admin/sangria.page.job.extension.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/js/job.registration.form.js b/jobs/js/job.registration.form.js
index 6d7cb9f..3fa813a 100644
--- a/jobs/js/job.registration.form.js
+++ b/jobs/js/job.registration.form.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/js/job.registration.request.page.js b/jobs/js/job.registration.request.page.js
index ab68c4d..e95e968 100644
--- a/jobs/js/job.registration.request.page.js
+++ b/jobs/js/job.registration.request.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/jobs/js/jobs.js b/jobs/js/jobs.js
index d8dc65b..a7a7434 100644
--- a/jobs/js/jobs.js
+++ b/jobs/js/jobs.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/_config.php b/marketplace/_config.php
index 23bbd3e..0fef7b3 100644
--- a/marketplace/_config.php
+++ b/marketplace/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/CloudAssembler.php b/marketplace/code/application/assemblers/CloudAssembler.php
index 9d5d477..ffb3e61 100644
--- a/marketplace/code/application/assemblers/CloudAssembler.php
+++ b/marketplace/code/application/assemblers/CloudAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/CompanyServiceAssembler.php b/marketplace/code/application/assemblers/CompanyServiceAssembler.php
index 7e34970..2f82a4d 100644
--- a/marketplace/code/application/assemblers/CompanyServiceAssembler.php
+++ b/marketplace/code/application/assemblers/CompanyServiceAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/ConsultantAssembler.php b/marketplace/code/application/assemblers/ConsultantAssembler.php
index 2a89dd7..676eec8 100644
--- a/marketplace/code/application/assemblers/ConsultantAssembler.php
+++ b/marketplace/code/application/assemblers/ConsultantAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/MarketPlaceAssembler.php b/marketplace/code/application/assemblers/MarketPlaceAssembler.php
index ea431e5..24583cd 100644
--- a/marketplace/code/application/assemblers/MarketPlaceAssembler.php
+++ b/marketplace/code/application/assemblers/MarketPlaceAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/OpenStackImplementationAssembler.php b/marketplace/code/application/assemblers/OpenStackImplementationAssembler.php
index 40df829..f78411c 100644
--- a/marketplace/code/application/assemblers/OpenStackImplementationAssembler.php
+++ b/marketplace/code/application/assemblers/OpenStackImplementationAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/assemblers/RegionalSupportedCompanyServiceAssembler.php b/marketplace/code/application/assemblers/RegionalSupportedCompanyServiceAssembler.php
index baf230e..3090efd 100644
--- a/marketplace/code/application/assemblers/RegionalSupportedCompanyServiceAssembler.php
+++ b/marketplace/code/application/assemblers/RegionalSupportedCompanyServiceAssembler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/AbstractQueryResult.php b/marketplace/code/application/queries/AbstractQueryResult.php
index 164c141..7d81c71 100644
--- a/marketplace/code/application/queries/AbstractQueryResult.php
+++ b/marketplace/code/application/queries/AbstractQueryResult.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/CompaniesWithDistributionCreationRightsResult.php b/marketplace/code/application/queries/CompaniesWithDistributionCreationRightsResult.php
index f57258f..92f9147 100644
--- a/marketplace/code/application/queries/CompaniesWithDistributionCreationRightsResult.php
+++ b/marketplace/code/application/queries/CompaniesWithDistributionCreationRightsResult.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/CompaniesWithMarketPlaceCreationRightsSpecification.php b/marketplace/code/application/queries/CompaniesWithMarketPlaceCreationRightsSpecification.php
index 71f5d75..ac9e789 100644
--- a/marketplace/code/application/queries/CompaniesWithMarketPlaceCreationRightsSpecification.php
+++ b/marketplace/code/application/queries/CompaniesWithMarketPlaceCreationRightsSpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/ICloudsDataCenterLocationsQueryHandler.php b/marketplace/code/application/queries/ICloudsDataCenterLocationsQueryHandler.php
index 3411c0e..a80dcd9 100644
--- a/marketplace/code/application/queries/ICloudsDataCenterLocationsQueryHandler.php
+++ b/marketplace/code/application/queries/ICloudsDataCenterLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/ICloudsNamesQueryHandler.php b/marketplace/code/application/queries/ICloudsNamesQueryHandler.php
index 366e152..97438d0 100644
--- a/marketplace/code/application/queries/ICloudsNamesQueryHandler.php
+++ b/marketplace/code/application/queries/ICloudsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/ICompaniesWithDistributionCreationRightsQueryHandler.php b/marketplace/code/application/queries/ICompaniesWithDistributionCreationRightsQueryHandler.php
index f3e8218..24da879 100644
--- a/marketplace/code/application/queries/ICompaniesWithDistributionCreationRightsQueryHandler.php
+++ b/marketplace/code/application/queries/ICompaniesWithDistributionCreationRightsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/IConsultantsNamesQueryHandler.php b/marketplace/code/application/queries/IConsultantsNamesQueryHandler.php
index 3e8558b..97b19c3 100644
--- a/marketplace/code/application/queries/IConsultantsNamesQueryHandler.php
+++ b/marketplace/code/application/queries/IConsultantsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/IConsultantsOfficesLocationsQueryHandler.php b/marketplace/code/application/queries/IConsultantsOfficesLocationsQueryHandler.php
index cb13f26..e3bbbd6 100644
--- a/marketplace/code/application/queries/IConsultantsOfficesLocationsQueryHandler.php
+++ b/marketplace/code/application/queries/IConsultantsOfficesLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/IOpenStackImplementationNamesQueryHandler.php b/marketplace/code/application/queries/IOpenStackImplementationNamesQueryHandler.php
index 963e5a3..c92d474 100644
--- a/marketplace/code/application/queries/IOpenStackImplementationNamesQueryHandler.php
+++ b/marketplace/code/application/queries/IOpenStackImplementationNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/IOpenStackImplementationNamesQuerySpecification.php b/marketplace/code/application/queries/IOpenStackImplementationNamesQuerySpecification.php
index 5314447..e42c921 100644
--- a/marketplace/code/application/queries/IOpenStackImplementationNamesQuerySpecification.php
+++ b/marketplace/code/application/queries/IOpenStackImplementationNamesQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/OpenStackImplementationNamesQueryResult.php b/marketplace/code/application/queries/OpenStackImplementationNamesQueryResult.php
index 7fcf3e2..514aa85 100644
--- a/marketplace/code/application/queries/OpenStackImplementationNamesQueryResult.php
+++ b/marketplace/code/application/queries/OpenStackImplementationNamesQueryResult.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/queries/OpenStackImplementationNamesQuerySpecification.php b/marketplace/code/application/queries/OpenStackImplementationNamesQuerySpecification.php
index b9350d3..2ec9701 100644
--- a/marketplace/code/application/queries/OpenStackImplementationNamesQuerySpecification.php
+++ b/marketplace/code/application/queries/OpenStackImplementationNamesQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/CompanyServiceCanAddResourcePolicy.php b/marketplace/code/application/strategies/CompanyServiceCanAddResourcePolicy.php
index cee35e1..f0e74b1 100644
--- a/marketplace/code/application/strategies/CompanyServiceCanAddResourcePolicy.php
+++ b/marketplace/code/application/strategies/CompanyServiceCanAddResourcePolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/CompanyServiceCanAddVideoPolicy.php b/marketplace/code/application/strategies/CompanyServiceCanAddVideoPolicy.php
index 907a314..cc82071 100644
--- a/marketplace/code/application/strategies/CompanyServiceCanAddVideoPolicy.php
+++ b/marketplace/code/application/strategies/CompanyServiceCanAddVideoPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/appliance/ApplianceAddPolicy.php b/marketplace/code/application/strategies/appliance/ApplianceAddPolicy.php
index a39bb18..a0d23f6 100644
--- a/marketplace/code/application/strategies/appliance/ApplianceAddPolicy.php
+++ b/marketplace/code/application/strategies/appliance/ApplianceAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/clouds/PrivateCloudAddPolicy.php b/marketplace/code/application/strategies/clouds/PrivateCloudAddPolicy.php
index a8c7067..a71d175 100644
--- a/marketplace/code/application/strategies/clouds/PrivateCloudAddPolicy.php
+++ b/marketplace/code/application/strategies/clouds/PrivateCloudAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/clouds/PublicCloudAddPolicy.php b/marketplace/code/application/strategies/clouds/PublicCloudAddPolicy.php
index 35609f8..8e454f6 100644
--- a/marketplace/code/application/strategies/clouds/PublicCloudAddPolicy.php
+++ b/marketplace/code/application/strategies/clouds/PublicCloudAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/consultant/ConsultantAddPolicy.php b/marketplace/code/application/strategies/consultant/ConsultantAddPolicy.php
index d43a8d2..54adebb 100644
--- a/marketplace/code/application/strategies/consultant/ConsultantAddPolicy.php
+++ b/marketplace/code/application/strategies/consultant/ConsultantAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/distribution/DistributionAddPolicy.php b/marketplace/code/application/strategies/distribution/DistributionAddPolicy.php
index 24abfb3..b72d099 100644
--- a/marketplace/code/application/strategies/distribution/DistributionAddPolicy.php
+++ b/marketplace/code/application/strategies/distribution/DistributionAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/training/TrainingAddPolicy.php b/marketplace/code/application/strategies/training/TrainingAddPolicy.php
index 59faf0a..857a56c 100644
--- a/marketplace/code/application/strategies/training/TrainingAddPolicy.php
+++ b/marketplace/code/application/strategies/training/TrainingAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/application/strategies/training/TrainingShowPolicy.php b/marketplace/code/application/strategies/training/TrainingShowPolicy.php
index 770df86..1d2a001 100644
--- a/marketplace/code/application/strategies/training/TrainingShowPolicy.php
+++ b/marketplace/code/application/strategies/training/TrainingShowPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/CompanyService.php b/marketplace/code/infrastructure/active_records/CompanyService.php
index 52fa3f9..a458653 100644
--- a/marketplace/code/infrastructure/active_records/CompanyService.php
+++ b/marketplace/code/infrastructure/active_records/CompanyService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/CompanyServiceResource.php b/marketplace/code/infrastructure/active_records/CompanyServiceResource.php
index 7267062..643c67e 100644
--- a/marketplace/code/infrastructure/active_records/CompanyServiceResource.php
+++ b/marketplace/code/infrastructure/active_records/CompanyServiceResource.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/GeoCodingQuery.php b/marketplace/code/infrastructure/active_records/GeoCodingQuery.php
index 2dc9f93..a603719 100644
--- a/marketplace/code/infrastructure/active_records/GeoCodingQuery.php
+++ b/marketplace/code/infrastructure/active_records/GeoCodingQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/GuestOSType.php b/marketplace/code/infrastructure/active_records/GuestOSType.php
index 9b9ff48..1c5b0d3 100644
--- a/marketplace/code/infrastructure/active_records/GuestOSType.php
+++ b/marketplace/code/infrastructure/active_records/GuestOSType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/HyperVisorType.php b/marketplace/code/infrastructure/active_records/HyperVisorType.php
index ce9ddbb..21cf5d0 100644
--- a/marketplace/code/infrastructure/active_records/HyperVisorType.php
+++ b/marketplace/code/infrastructure/active_records/HyperVisorType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceAdminMember.php b/marketplace/code/infrastructure/active_records/MarketPlaceAdminMember.php
index 8f01f16..b7967b6 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceAdminMember.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceAdminMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceAllowedInstance.php b/marketplace/code/infrastructure/active_records/MarketPlaceAllowedInstance.php
index d0270e8..68cd110 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceAllowedInstance.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceAllowedInstance.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceCompany.php b/marketplace/code/infrastructure/active_records/MarketPlaceCompany.php
index f9eeb53..d99e7fa 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceCompany.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceCompany.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceType.php b/marketplace/code/infrastructure/active_records/MarketPlaceType.php
index 3051fe5..86e4312 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceType.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceVideo.php b/marketplace/code/infrastructure/active_records/MarketPlaceVideo.php
index cab2fa1..00ea0e2 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceVideo.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceVideo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketPlaceVideoType.php b/marketplace/code/infrastructure/active_records/MarketPlaceVideoType.php
index 96a2eb1..2b9caa7 100644
--- a/marketplace/code/infrastructure/active_records/MarketPlaceVideoType.php
+++ b/marketplace/code/infrastructure/active_records/MarketPlaceVideoType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/MarketplaceContractTemplate.php b/marketplace/code/infrastructure/active_records/MarketplaceContractTemplate.php
index c0a8341..bf7edda 100644
--- a/marketplace/code/infrastructure/active_records/MarketplaceContractTemplate.php
+++ b/marketplace/code/infrastructure/active_records/MarketplaceContractTemplate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/OpenStackImplementation.php b/marketplace/code/infrastructure/active_records/OpenStackImplementation.php
index 0b37704..b3ef1ea 100644
--- a/marketplace/code/infrastructure/active_records/OpenStackImplementation.php
+++ b/marketplace/code/infrastructure/active_records/OpenStackImplementation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/OpenStackImplementationApiCoverage.php b/marketplace/code/infrastructure/active_records/OpenStackImplementationApiCoverage.php
index ee7d8c1..6f43983 100644
--- a/marketplace/code/infrastructure/active_records/OpenStackImplementationApiCoverage.php
+++ b/marketplace/code/infrastructure/active_records/OpenStackImplementationApiCoverage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/Region.php b/marketplace/code/infrastructure/active_records/Region.php
index dfe123a..36e6bd3 100644
--- a/marketplace/code/infrastructure/active_records/Region.php
+++ b/marketplace/code/infrastructure/active_records/Region.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/RegionalSupport.php b/marketplace/code/infrastructure/active_records/RegionalSupport.php
index b6c9e8c..5eed4ab 100644
--- a/marketplace/code/infrastructure/active_records/RegionalSupport.php
+++ b/marketplace/code/infrastructure/active_records/RegionalSupport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/RegionalSupportedCompanyService.php b/marketplace/code/infrastructure/active_records/RegionalSupportedCompanyService.php
index a002126..5f6bd6e 100644
--- a/marketplace/code/infrastructure/active_records/RegionalSupportedCompanyService.php
+++ b/marketplace/code/infrastructure/active_records/RegionalSupportedCompanyService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/SecurityGroupDecorator.php b/marketplace/code/infrastructure/active_records/SecurityGroupDecorator.php
index 57dd36f..7f761a4 100644
--- a/marketplace/code/infrastructure/active_records/SecurityGroupDecorator.php
+++ b/marketplace/code/infrastructure/active_records/SecurityGroupDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/SupportChannelType.php b/marketplace/code/infrastructure/active_records/SupportChannelType.php
index a404637..e7f7110 100644
--- a/marketplace/code/infrastructure/active_records/SupportChannelType.php
+++ b/marketplace/code/infrastructure/active_records/SupportChannelType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/appliance_distributions/Appliance.php b/marketplace/code/infrastructure/active_records/appliance_distributions/Appliance.php
index e2d54de..4026c46 100644
--- a/marketplace/code/infrastructure/active_records/appliance_distributions/Appliance.php
+++ b/marketplace/code/infrastructure/active_records/appliance_distributions/Appliance.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/appliance_distributions/Distribution.php b/marketplace/code/infrastructure/active_records/appliance_distributions/Distribution.php
index 78b5dd4..65a753e 100644
--- a/marketplace/code/infrastructure/active_records/appliance_distributions/Distribution.php
+++ b/marketplace/code/infrastructure/active_records/appliance_distributions/Distribution.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/AvailabilityZone.php b/marketplace/code/infrastructure/active_records/clouds/AvailabilityZone.php
index 053d573..737682d 100644
--- a/marketplace/code/infrastructure/active_records/clouds/AvailabilityZone.php
+++ b/marketplace/code/infrastructure/active_records/clouds/AvailabilityZone.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/CloudService.php b/marketplace/code/infrastructure/active_records/clouds/CloudService.php
index 21aae4d..8fc7087 100644
--- a/marketplace/code/infrastructure/active_records/clouds/CloudService.php
+++ b/marketplace/code/infrastructure/active_records/clouds/CloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/CloudServiceOffered.php b/marketplace/code/infrastructure/active_records/clouds/CloudServiceOffered.php
index 8748946..88c6087 100644
--- a/marketplace/code/infrastructure/active_records/clouds/CloudServiceOffered.php
+++ b/marketplace/code/infrastructure/active_records/clouds/CloudServiceOffered.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/DataCenterLocation.php b/marketplace/code/infrastructure/active_records/clouds/DataCenterLocation.php
index 4856bcd..2c40cbd 100644
--- a/marketplace/code/infrastructure/active_records/clouds/DataCenterLocation.php
+++ b/marketplace/code/infrastructure/active_records/clouds/DataCenterLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/DataCenterRegion.php b/marketplace/code/infrastructure/active_records/clouds/DataCenterRegion.php
index 4b6d170..ded2cb7 100644
--- a/marketplace/code/infrastructure/active_records/clouds/DataCenterRegion.php
+++ b/marketplace/code/infrastructure/active_records/clouds/DataCenterRegion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/PricingSchemaType.php b/marketplace/code/infrastructure/active_records/clouds/PricingSchemaType.php
index 78a5d7f..a418be6 100644
--- a/marketplace/code/infrastructure/active_records/clouds/PricingSchemaType.php
+++ b/marketplace/code/infrastructure/active_records/clouds/PricingSchemaType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/PrivateCloudService.php b/marketplace/code/infrastructure/active_records/clouds/PrivateCloudService.php
index e521398..8aff8f3 100644
--- a/marketplace/code/infrastructure/active_records/clouds/PrivateCloudService.php
+++ b/marketplace/code/infrastructure/active_records/clouds/PrivateCloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/clouds/PublicCloudService.php b/marketplace/code/infrastructure/active_records/clouds/PublicCloudService.php
index 5870af8..5e43b1f 100644
--- a/marketplace/code/infrastructure/active_records/clouds/PublicCloudService.php
+++ b/marketplace/code/infrastructure/active_records/clouds/PublicCloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/ConfigurationManagementType.php b/marketplace/code/infrastructure/active_records/consultants/ConfigurationManagementType.php
index 8459a42..abcc9af 100644
--- a/marketplace/code/infrastructure/active_records/consultants/ConfigurationManagementType.php
+++ b/marketplace/code/infrastructure/active_records/consultants/ConfigurationManagementType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/Consultant.php b/marketplace/code/infrastructure/active_records/consultants/Consultant.php
index 1caac8e..d36901a 100644
--- a/marketplace/code/infrastructure/active_records/consultants/Consultant.php
+++ b/marketplace/code/infrastructure/active_records/consultants/Consultant.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/ConsultantClient.php b/marketplace/code/infrastructure/active_records/consultants/ConsultantClient.php
index c8efc0a..85beeb6 100644
--- a/marketplace/code/infrastructure/active_records/consultants/ConsultantClient.php
+++ b/marketplace/code/infrastructure/active_records/consultants/ConsultantClient.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/ConsultantServiceOfferedType.php b/marketplace/code/infrastructure/active_records/consultants/ConsultantServiceOfferedType.php
index 675d8c8..c597fdf 100644
--- a/marketplace/code/infrastructure/active_records/consultants/ConsultantServiceOfferedType.php
+++ b/marketplace/code/infrastructure/active_records/consultants/ConsultantServiceOfferedType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/Office.php b/marketplace/code/infrastructure/active_records/consultants/Office.php
index d432276..6e5b2cb 100644
--- a/marketplace/code/infrastructure/active_records/consultants/Office.php
+++ b/marketplace/code/infrastructure/active_records/consultants/Office.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/consultants/SpokenLanguage.php b/marketplace/code/infrastructure/active_records/consultants/SpokenLanguage.php
index a6c364d..847975f 100644
--- a/marketplace/code/infrastructure/active_records/consultants/SpokenLanguage.php
+++ b/marketplace/code/infrastructure/active_records/consultants/SpokenLanguage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackApiVersion.php b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackApiVersion.php
index a95e423..7f9dc11 100644
--- a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackApiVersion.php
+++ b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackApiVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackComponent.php b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackComponent.php
index de9bfeb..b2f4363 100644
--- a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackComponent.php
+++ b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackComponent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackRelease.php b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackRelease.php
index 3e1dead..00af3db 100644
--- a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackRelease.php
+++ b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackRelease.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackReleaseSupportedApiVersion.php b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackReleaseSupportedApiVersion.php
index 42ee258..614e5d9 100644
--- a/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackReleaseSupportedApiVersion.php
+++ b/marketplace/code/infrastructure/active_records/openstack_releases/OpenStackReleaseSupportedApiVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingActivity.php b/marketplace/code/infrastructure/active_records/training/TrainingActivity.php
index 0b624d8..f2536b5 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingActivity.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingActivity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourse.php b/marketplace/code/infrastructure/active_records/training/TrainingCourse.php
index 52a6501..b87dfc2 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourse.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourseLevel.php b/marketplace/code/infrastructure/active_records/training/TrainingCourseLevel.php
index b1206a6..1390d7b 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourseLevel.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourseLevel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCoursePrerequisite.php b/marketplace/code/infrastructure/active_records/training/TrainingCoursePrerequisite.php
index 77b44b8..687cbb3 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCoursePrerequisite.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCoursePrerequisite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourseRelatedProject.php b/marketplace/code/infrastructure/active_records/training/TrainingCourseRelatedProject.php
index 0841c4d..ecfb2b9 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourseRelatedProject.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourseRelatedProject.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourseSchedule.php b/marketplace/code/infrastructure/active_records/training/TrainingCourseSchedule.php
index e3b21e9..b0be0cb 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourseSchedule.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourseSchedule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourseScheduleTime.php b/marketplace/code/infrastructure/active_records/training/TrainingCourseScheduleTime.php
index dc98ca4..dec7398 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourseScheduleTime.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourseScheduleTime.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingCourseType.php b/marketplace/code/infrastructure/active_records/training/TrainingCourseType.php
index 3157d48..9f555d3 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingCourseType.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingCourseType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/active_records/training/TrainingService.php b/marketplace/code/infrastructure/active_records/training/TrainingService.php
index 0427872..0b84aae 100644
--- a/marketplace/code/infrastructure/active_records/training/TrainingService.php
+++ b/marketplace/code/infrastructure/active_records/training/TrainingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/ApplianceFactory.php b/marketplace/code/infrastructure/factories/ApplianceFactory.php
index 6f9bafe..98c45bd 100644
--- a/marketplace/code/infrastructure/factories/ApplianceFactory.php
+++ b/marketplace/code/infrastructure/factories/ApplianceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/CloudFactory.php b/marketplace/code/infrastructure/factories/CloudFactory.php
index e6963ff..6693cbc 100644
--- a/marketplace/code/infrastructure/factories/CloudFactory.php
+++ b/marketplace/code/infrastructure/factories/CloudFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/ConsultantFactory.php b/marketplace/code/infrastructure/factories/ConsultantFactory.php
index e1a9739..2189e89 100644
--- a/marketplace/code/infrastructure/factories/ConsultantFactory.php
+++ b/marketplace/code/infrastructure/factories/ConsultantFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/DistributionFactory.php b/marketplace/code/infrastructure/factories/DistributionFactory.php
index 6f188c9..186b34d 100644
--- a/marketplace/code/infrastructure/factories/DistributionFactory.php
+++ b/marketplace/code/infrastructure/factories/DistributionFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/MarketplaceFactory.php b/marketplace/code/infrastructure/factories/MarketplaceFactory.php
index acc61d9..f8fe622 100644
--- a/marketplace/code/infrastructure/factories/MarketplaceFactory.php
+++ b/marketplace/code/infrastructure/factories/MarketplaceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/OpenStackApiFactory.php b/marketplace/code/infrastructure/factories/OpenStackApiFactory.php
index e63e35d..61d6cc8 100644
--- a/marketplace/code/infrastructure/factories/OpenStackApiFactory.php
+++ b/marketplace/code/infrastructure/factories/OpenStackApiFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/OpenStackImplementationFactory.php b/marketplace/code/infrastructure/factories/OpenStackImplementationFactory.php
index 0950b3d..6a43bf9 100644
--- a/marketplace/code/infrastructure/factories/OpenStackImplementationFactory.php
+++ b/marketplace/code/infrastructure/factories/OpenStackImplementationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/PrivateCloudFactory.php b/marketplace/code/infrastructure/factories/PrivateCloudFactory.php
index 0fcf865..9cd9516 100644
--- a/marketplace/code/infrastructure/factories/PrivateCloudFactory.php
+++ b/marketplace/code/infrastructure/factories/PrivateCloudFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/PublicCloudFactory.php b/marketplace/code/infrastructure/factories/PublicCloudFactory.php
index 3d6f070..c1db350 100644
--- a/marketplace/code/infrastructure/factories/PublicCloudFactory.php
+++ b/marketplace/code/infrastructure/factories/PublicCloudFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/RegionalSupportedCompanyServiceFactory.php b/marketplace/code/infrastructure/factories/RegionalSupportedCompanyServiceFactory.php
index 4081e57..ae77eef 100644
--- a/marketplace/code/infrastructure/factories/RegionalSupportedCompanyServiceFactory.php
+++ b/marketplace/code/infrastructure/factories/RegionalSupportedCompanyServiceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/TrainingFactory.php b/marketplace/code/infrastructure/factories/TrainingFactory.php
index f95e225..c4da398 100644
--- a/marketplace/code/infrastructure/factories/TrainingFactory.php
+++ b/marketplace/code/infrastructure/factories/TrainingFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/UtilFactory.php b/marketplace/code/infrastructure/factories/UtilFactory.php
index 87518ac..bfe4527 100644
--- a/marketplace/code/infrastructure/factories/UtilFactory.php
+++ b/marketplace/code/infrastructure/factories/UtilFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/factories/ValidatorFactory.php b/marketplace/code/infrastructure/factories/ValidatorFactory.php
index 7381f57..7777b97 100644
--- a/marketplace/code/infrastructure/factories/ValidatorFactory.php
+++ b/marketplace/code/infrastructure/factories/ValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/CloudsDataCenterLocationsQueryHandler.php b/marketplace/code/infrastructure/queries/CloudsDataCenterLocationsQueryHandler.php
index e9c30dd..5f4b012 100644
--- a/marketplace/code/infrastructure/queries/CloudsDataCenterLocationsQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/CloudsDataCenterLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/CloudsNamesQueryHandler.php b/marketplace/code/infrastructure/queries/CloudsNamesQueryHandler.php
index edd44af..591907e 100644
--- a/marketplace/code/infrastructure/queries/CloudsNamesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/CloudsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/CloudsServicesQueryHandler.php b/marketplace/code/infrastructure/queries/CloudsServicesQueryHandler.php
index 515a81d..81d8917 100644
--- a/marketplace/code/infrastructure/queries/CloudsServicesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/CloudsServicesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/CompaniesWithMarketplaceCreationRightsSapphireQueryHandler.php b/marketplace/code/infrastructure/queries/CompaniesWithMarketplaceCreationRightsSapphireQueryHandler.php
index c9e12ca..50e9c2c 100644
--- a/marketplace/code/infrastructure/queries/CompaniesWithMarketplaceCreationRightsSapphireQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/CompaniesWithMarketplaceCreationRightsSapphireQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/ConsultantsNamesQueryHandler.php b/marketplace/code/infrastructure/queries/ConsultantsNamesQueryHandler.php
index 1154027..3dc11c4 100644
--- a/marketplace/code/infrastructure/queries/ConsultantsNamesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/ConsultantsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/ConsultantsOfficesLocationsQueryHandler.php b/marketplace/code/infrastructure/queries/ConsultantsOfficesLocationsQueryHandler.php
index 298a3f6..c2b50b2 100644
--- a/marketplace/code/infrastructure/queries/ConsultantsOfficesLocationsQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/ConsultantsOfficesLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/ConsultantsServicesQueryHandler.php b/marketplace/code/infrastructure/queries/ConsultantsServicesQueryHandler.php
index 43ee9c5..60fe460 100644
--- a/marketplace/code/infrastructure/queries/ConsultantsServicesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/ConsultantsServicesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/OpenStackImplementationNamesQueryHandler.php b/marketplace/code/infrastructure/queries/OpenStackImplementationNamesQueryHandler.php
index b304599..54cebca 100644
--- a/marketplace/code/infrastructure/queries/OpenStackImplementationNamesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/OpenStackImplementationNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/OpenStackImplementationServicesQueryHandler.php b/marketplace/code/infrastructure/queries/OpenStackImplementationServicesQueryHandler.php
index 7f957bf..1e99527 100644
--- a/marketplace/code/infrastructure/queries/OpenStackImplementationServicesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/OpenStackImplementationServicesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PrivateCloudsDataCenterLocationsQueryHandler.php b/marketplace/code/infrastructure/queries/PrivateCloudsDataCenterLocationsQueryHandler.php
index 5f50c4c..781a194 100644
--- a/marketplace/code/infrastructure/queries/PrivateCloudsDataCenterLocationsQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PrivateCloudsDataCenterLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PrivateCloudsNamesQueryHandler.php b/marketplace/code/infrastructure/queries/PrivateCloudsNamesQueryHandler.php
index a2f8b94..8807da2 100644
--- a/marketplace/code/infrastructure/queries/PrivateCloudsNamesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PrivateCloudsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PrivateCloudsServicesQueryHandler.php b/marketplace/code/infrastructure/queries/PrivateCloudsServicesQueryHandler.php
index cee54e3..4356dc7 100644
--- a/marketplace/code/infrastructure/queries/PrivateCloudsServicesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PrivateCloudsServicesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PublicCloudsDataCenterLocationsQueryHandler.php b/marketplace/code/infrastructure/queries/PublicCloudsDataCenterLocationsQueryHandler.php
index fae43c0..0611442 100644
--- a/marketplace/code/infrastructure/queries/PublicCloudsDataCenterLocationsQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PublicCloudsDataCenterLocationsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PublicCloudsNamesQueryHandler.php b/marketplace/code/infrastructure/queries/PublicCloudsNamesQueryHandler.php
index f4bd37f..ece8707 100644
--- a/marketplace/code/infrastructure/queries/PublicCloudsNamesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PublicCloudsNamesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/PublicCloudsServicesQueryHandler.php b/marketplace/code/infrastructure/queries/PublicCloudsServicesQueryHandler.php
index bb213e6..988c4c9 100644
--- a/marketplace/code/infrastructure/queries/PublicCloudsServicesQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/PublicCloudsServicesQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/TrainingCourseTopicsQueryHandler.php b/marketplace/code/infrastructure/queries/TrainingCourseTopicsQueryHandler.php
index cf9ac22..2a1ff85 100644
--- a/marketplace/code/infrastructure/queries/TrainingCourseTopicsQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/TrainingCourseTopicsQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/TrainingCoursesLevelQueryHandler.php b/marketplace/code/infrastructure/queries/TrainingCoursesLevelQueryHandler.php
index 8c516b3..2e13f9a 100644
--- a/marketplace/code/infrastructure/queries/TrainingCoursesLevelQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/TrainingCoursesLevelQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/queries/TrainingCoursesLocationQueryHandler.php b/marketplace/code/infrastructure/queries/TrainingCoursesLocationQueryHandler.php
index dc71e3d..a0ff028 100644
--- a/marketplace/code/infrastructure/queries/TrainingCoursesLocationQueryHandler.php
+++ b/marketplace/code/infrastructure/queries/TrainingCoursesLocationQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireApplianceRepository.php b/marketplace/code/infrastructure/repositories/SapphireApplianceRepository.php
index 1b7b817..42ff21f 100644
--- a/marketplace/code/infrastructure/repositories/SapphireApplianceRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireApplianceRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireCompanyServiceRepository.php b/marketplace/code/infrastructure/repositories/SapphireCompanyServiceRepository.php
index ac390e7..d6a5d9f 100644
--- a/marketplace/code/infrastructure/repositories/SapphireCompanyServiceRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireCompanyServiceRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireConfigurationManagementTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireConfigurationManagementTypeRepository.php
index a5085d4..a34c3c2 100644
--- a/marketplace/code/infrastructure/repositories/SapphireConfigurationManagementTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireConfigurationManagementTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireConsultantRepository.php b/marketplace/code/infrastructure/repositories/SapphireConsultantRepository.php
index c34f140..e25a2e6 100644
--- a/marketplace/code/infrastructure/repositories/SapphireConsultantRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireConsultantRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireConsultantServiceOfferedTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireConsultantServiceOfferedTypeRepository.php
index 48a5172..4ebd349 100644
--- a/marketplace/code/infrastructure/repositories/SapphireConsultantServiceOfferedTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireConsultantServiceOfferedTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireCourseRelatedProjectRepository.php b/marketplace/code/infrastructure/repositories/SapphireCourseRelatedProjectRepository.php
index b44826b..5c36cb1 100644
--- a/marketplace/code/infrastructure/repositories/SapphireCourseRelatedProjectRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireCourseRelatedProjectRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireCourseRepository.php b/marketplace/code/infrastructure/repositories/SapphireCourseRepository.php
index 93efed7..7b28299 100644
--- a/marketplace/code/infrastructure/repositories/SapphireCourseRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireCourseRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireDistributionRepository.php b/marketplace/code/infrastructure/repositories/SapphireDistributionRepository.php
index bf2d46b..dcc2436 100644
--- a/marketplace/code/infrastructure/repositories/SapphireDistributionRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireDistributionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireGeoCodingQueryRepository.php b/marketplace/code/infrastructure/repositories/SapphireGeoCodingQueryRepository.php
index 9818aba..88aafdb 100644
--- a/marketplace/code/infrastructure/repositories/SapphireGeoCodingQueryRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireGeoCodingQueryRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireGuestOSTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireGuestOSTypeRepository.php
index 37bde73..fd770c6 100644
--- a/marketplace/code/infrastructure/repositories/SapphireGuestOSTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireGuestOSTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireHyperVisorTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireHyperVisorTypeRepository.php
index 6477400..6462aef 100644
--- a/marketplace/code/infrastructure/repositories/SapphireHyperVisorTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireHyperVisorTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireMarketPlaceTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireMarketPlaceTypeRepository.php
index 537a60b..c2d3123 100644
--- a/marketplace/code/infrastructure/repositories/SapphireMarketPlaceTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireMarketPlaceTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireMarketPlaceVideoTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireMarketPlaceVideoTypeRepository.php
index b6ccd48..193546a 100644
--- a/marketplace/code/infrastructure/repositories/SapphireMarketPlaceVideoTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireMarketPlaceVideoTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireOpenStackApiVersionRepository.php b/marketplace/code/infrastructure/repositories/SapphireOpenStackApiVersionRepository.php
index 5032c2c..950f621 100644
--- a/marketplace/code/infrastructure/repositories/SapphireOpenStackApiVersionRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireOpenStackApiVersionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireOpenStackComponentRepository.php b/marketplace/code/infrastructure/repositories/SapphireOpenStackComponentRepository.php
index f071eab..39188e6 100644
--- a/marketplace/code/infrastructure/repositories/SapphireOpenStackComponentRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireOpenStackComponentRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireOpenStackImplementationRepository.php b/marketplace/code/infrastructure/repositories/SapphireOpenStackImplementationRepository.php
index c709251..21ffdb4 100644
--- a/marketplace/code/infrastructure/repositories/SapphireOpenStackImplementationRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireOpenStackImplementationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseRepository.php b/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseRepository.php
index 0bce430..1871951 100644
--- a/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseSupportedApiVersionRepository.php b/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseSupportedApiVersionRepository.php
index bd047b6..170a897 100644
--- a/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseSupportedApiVersionRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireOpenStackReleaseSupportedApiVersionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphirePricingSchemaRepository.php b/marketplace/code/infrastructure/repositories/SapphirePricingSchemaRepository.php
index 48e82f9..a0ba3a8 100644
--- a/marketplace/code/infrastructure/repositories/SapphirePricingSchemaRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphirePricingSchemaRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphirePrivateCloudRepository.php b/marketplace/code/infrastructure/repositories/SapphirePrivateCloudRepository.php
index 4c6479a..ad1ed4a 100644
--- a/marketplace/code/infrastructure/repositories/SapphirePrivateCloudRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphirePrivateCloudRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphirePublicCloudRepository.php b/marketplace/code/infrastructure/repositories/SapphirePublicCloudRepository.php
index 17dbea5..9e7789d 100644
--- a/marketplace/code/infrastructure/repositories/SapphirePublicCloudRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphirePublicCloudRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireRegionRepository.php b/marketplace/code/infrastructure/repositories/SapphireRegionRepository.php
index 3fb5c7c..be363b9 100644
--- a/marketplace/code/infrastructure/repositories/SapphireRegionRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireRegionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireRegionalSupportedCompanyServiceRepository.php b/marketplace/code/infrastructure/repositories/SapphireRegionalSupportedCompanyServiceRepository.php
index 0b5cceb..5c81595 100644
--- a/marketplace/code/infrastructure/repositories/SapphireRegionalSupportedCompanyServiceRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireRegionalSupportedCompanyServiceRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireSecurityGroupRepository.php b/marketplace/code/infrastructure/repositories/SapphireSecurityGroupRepository.php
index 89b476c..5d27a52 100644
--- a/marketplace/code/infrastructure/repositories/SapphireSecurityGroupRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireSecurityGroupRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireSpokenLanguageRepository.php b/marketplace/code/infrastructure/repositories/SapphireSpokenLanguageRepository.php
index 76875c3..b0fb8bb 100644
--- a/marketplace/code/infrastructure/repositories/SapphireSpokenLanguageRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireSpokenLanguageRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireSupportChannelTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireSupportChannelTypeRepository.php
index a3417b8..d38f47d 100644
--- a/marketplace/code/infrastructure/repositories/SapphireSupportChannelTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireSupportChannelTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireTrainingCourseLevelRepository.php b/marketplace/code/infrastructure/repositories/SapphireTrainingCourseLevelRepository.php
index 572b872..48d75a1 100644
--- a/marketplace/code/infrastructure/repositories/SapphireTrainingCourseLevelRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireTrainingCourseLevelRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireTrainingCourseTypeRepository.php b/marketplace/code/infrastructure/repositories/SapphireTrainingCourseTypeRepository.php
index c7a92fc..a8088fe 100644
--- a/marketplace/code/infrastructure/repositories/SapphireTrainingCourseTypeRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireTrainingCourseTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/infrastructure/repositories/SapphireTrainingServiceRepository.php b/marketplace/code/infrastructure/repositories/SapphireTrainingServiceRepository.php
index 0328eb9..de03e19 100644
--- a/marketplace/code/infrastructure/repositories/SapphireTrainingServiceRepository.php
+++ b/marketplace/code/infrastructure/repositories/SapphireTrainingServiceRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/AbstractRestfulJsonApi.php b/marketplace/code/interfaces/restfull_api/AbstractRestfulJsonApi.php
index f5fb1ad..896634e 100644
--- a/marketplace/code/interfaces/restfull_api/AbstractRestfulJsonApi.php
+++ b/marketplace/code/interfaces/restfull_api/AbstractRestfulJsonApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/OpenStackComponentsCrudApi.php b/marketplace/code/interfaces/restfull_api/OpenStackComponentsCrudApi.php
index 2f1150b..5aaf599 100644
--- a/marketplace/code/interfaces/restfull_api/OpenStackComponentsCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/OpenStackComponentsCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/OpenStackReleasesCrudApi.php b/marketplace/code/interfaces/restfull_api/OpenStackReleasesCrudApi.php
index 75d3865..8bd6cb4 100644
--- a/marketplace/code/interfaces/restfull_api/OpenStackReleasesCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/OpenStackReleasesCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/ApplianceCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/ApplianceCrudApi.php
index c629057..64871b8 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/ApplianceCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/ApplianceCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/CompanyServiceCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/CompanyServiceCrudApi.php
index 2c7ee36..9093efd 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/CompanyServiceCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/CompanyServiceCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
index 719e925..372b1a4 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/ConsultantsCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/DistributionCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/DistributionCrudApi.php
index 03f1a8a..52ff19b 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/DistributionCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/DistributionCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/MarketPlaceRestfulApi.php b/marketplace/code/interfaces/restfull_api/marketplace/MarketPlaceRestfulApi.php
index e854fa7..c33f90d 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/MarketPlaceRestfulApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/MarketPlaceRestfulApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/PrivateCloudCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/PrivateCloudCrudApi.php
index d593ae8..5e0abb7 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/PrivateCloudCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/PrivateCloudCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/restfull_api/marketplace/PublicCloudCrudApi.php b/marketplace/code/interfaces/restfull_api/marketplace/PublicCloudCrudApi.php
index cd040a3..2304eb3 100644
--- a/marketplace/code/interfaces/restfull_api/marketplace/PublicCloudCrudApi.php
+++ b/marketplace/code/interfaces/restfull_api/marketplace/PublicCloudCrudApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/AbstractController.php b/marketplace/code/interfaces/web/AbstractController.php
index fcabf9d..45d4135 100644
--- a/marketplace/code/interfaces/web/AbstractController.php
+++ b/marketplace/code/interfaces/web/AbstractController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/clouds/Cloud_Controller.php b/marketplace/code/interfaces/web/clouds/Cloud_Controller.php
index 752509e..bd7266b 100644
--- a/marketplace/code/interfaces/web/clouds/Cloud_Controller.php
+++ b/marketplace/code/interfaces/web/clouds/Cloud_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/clouds/PrivateCloud_Controller.php b/marketplace/code/interfaces/web/clouds/PrivateCloud_Controller.php
index 64b4668..159bc83 100644
--- a/marketplace/code/interfaces/web/clouds/PrivateCloud_Controller.php
+++ b/marketplace/code/interfaces/web/clouds/PrivateCloud_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/clouds/PublicCloud_Controller.php b/marketplace/code/interfaces/web/clouds/PublicCloud_Controller.php
index b64d11b..e99b1aa 100644
--- a/marketplace/code/interfaces/web/clouds/PublicCloud_Controller.php
+++ b/marketplace/code/interfaces/web/clouds/PublicCloud_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/consultants/Consultants_Controller.php b/marketplace/code/interfaces/web/consultants/Consultants_Controller.php
index 2c02ab7..f1cf4f9 100644
--- a/marketplace/code/interfaces/web/consultants/Consultants_Controller.php
+++ b/marketplace/code/interfaces/web/consultants/Consultants_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/implementations/Implementation_Controller.php b/marketplace/code/interfaces/web/implementations/Implementation_Controller.php
index 6f39c5f..d9c2b66 100644
--- a/marketplace/code/interfaces/web/implementations/Implementation_Controller.php
+++ b/marketplace/code/interfaces/web/implementations/Implementation_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/training/TrainingFacade.php b/marketplace/code/interfaces/web/training/TrainingFacade.php
index 7af7347..8411e46 100644
--- a/marketplace/code/interfaces/web/training/TrainingFacade.php
+++ b/marketplace/code/interfaces/web/training/TrainingFacade.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/interfaces/web/training/Training_Controller.php b/marketplace/code/interfaces/web/training/Training_Controller.php
index ea560eb..19156f3 100644
--- a/marketplace/code/interfaces/web/training/Training_Controller.php
+++ b/marketplace/code/interfaces/web/training/Training_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/migrations/CacheServiceStub.php b/marketplace/code/migrations/CacheServiceStub.php
index 6297505..8ccc3f8 100644
--- a/marketplace/code/migrations/CacheServiceStub.php
+++ b/marketplace/code/migrations/CacheServiceStub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/migrations/MarketPlaceTypeAddPolicyStub.php b/marketplace/code/migrations/MarketPlaceTypeAddPolicyStub.php
index 1833433..6c12fa0 100644
--- a/marketplace/code/migrations/MarketPlaceTypeAddPolicyStub.php
+++ b/marketplace/code/migrations/MarketPlaceTypeAddPolicyStub.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/migrations/MarketplaceTypeSeedTask.php b/marketplace/code/migrations/MarketplaceTypeSeedTask.php
index a5fd1a4..e1cffbb 100644
--- a/marketplace/code/migrations/MarketplaceTypeSeedTask.php
+++ b/marketplace/code/migrations/MarketplaceTypeSeedTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/migrations/NewMarketplaceTypePrivateCloudSeedTask.php b/marketplace/code/migrations/NewMarketplaceTypePrivateCloudSeedTask.php
index f49fd64..f934634 100644
--- a/marketplace/code/migrations/NewMarketplaceTypePrivateCloudSeedTask.php
+++ b/marketplace/code/migrations/NewMarketplaceTypePrivateCloudSeedTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/migrations/Training2MarketplaceMigrationTask.php b/marketplace/code/migrations/Training2MarketplaceMigrationTask.php
index d844035..5886b7c 100644
--- a/marketplace/code/migrations/Training2MarketplaceMigrationTask.php
+++ b/marketplace/code/migrations/Training2MarketplaceMigrationTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/IMarketPlaceAdmin.php b/marketplace/code/model/IMarketPlaceAdmin.php
index 2856cea..4fe08b0 100644
--- a/marketplace/code/model/IMarketPlaceAdmin.php
+++ b/marketplace/code/model/IMarketPlaceAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/OpenStackImplementationManager.php b/marketplace/code/model/OpenStackImplementationManager.php
index e322e6b..5505b6c 100644
--- a/marketplace/code/model/OpenStackImplementationManager.php
+++ b/marketplace/code/model/OpenStackImplementationManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/CompanyDTO.php b/marketplace/code/model/base_entities/CompanyDTO.php
index 4089650..e5854a4 100644
--- a/marketplace/code/model/base_entities/CompanyDTO.php
+++ b/marketplace/code/model/base_entities/CompanyDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/CompanyServiceManager.php b/marketplace/code/model/base_entities/CompanyServiceManager.php
index 9b9b5e5..01bae94 100644
--- a/marketplace/code/model/base_entities/CompanyServiceManager.php
+++ b/marketplace/code/model/base_entities/CompanyServiceManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICityLocationRepository.php b/marketplace/code/model/base_entities/ICityLocationRepository.php
index 9f3a9c0..62b940c 100644
--- a/marketplace/code/model/base_entities/ICityLocationRepository.php
+++ b/marketplace/code/model/base_entities/ICityLocationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICompany.php b/marketplace/code/model/base_entities/ICompany.php
index 0ef5d55..cf2ff12 100644
--- a/marketplace/code/model/base_entities/ICompany.php
+++ b/marketplace/code/model/base_entities/ICompany.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICompanyService.php b/marketplace/code/model/base_entities/ICompanyService.php
index 7aa5a14..a74df24 100644
--- a/marketplace/code/model/base_entities/ICompanyService.php
+++ b/marketplace/code/model/base_entities/ICompanyService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICompanyServiceFactory.php b/marketplace/code/model/base_entities/ICompanyServiceFactory.php
index 299338c..a2d8170 100644
--- a/marketplace/code/model/base_entities/ICompanyServiceFactory.php
+++ b/marketplace/code/model/base_entities/ICompanyServiceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICompanyServiceRepository.php b/marketplace/code/model/base_entities/ICompanyServiceRepository.php
index 1463882..be5e830 100644
--- a/marketplace/code/model/base_entities/ICompanyServiceRepository.php
+++ b/marketplace/code/model/base_entities/ICompanyServiceRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ICompanyServiceResource.php b/marketplace/code/model/base_entities/ICompanyServiceResource.php
index 9f11025..172ebfe 100644
--- a/marketplace/code/model/base_entities/ICompanyServiceResource.php
+++ b/marketplace/code/model/base_entities/ICompanyServiceResource.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IGuestOSType.php b/marketplace/code/model/base_entities/IGuestOSType.php
index 4943f54..b2e955a 100644
--- a/marketplace/code/model/base_entities/IGuestOSType.php
+++ b/marketplace/code/model/base_entities/IGuestOSType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IHyperVisorType.php b/marketplace/code/model/base_entities/IHyperVisorType.php
index 1e86c12..47a2a5d 100644
--- a/marketplace/code/model/base_entities/IHyperVisorType.php
+++ b/marketplace/code/model/base_entities/IHyperVisorType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketPlaceAllowedInstance.php b/marketplace/code/model/base_entities/IMarketPlaceAllowedInstance.php
index 127de8e..7ebe861 100644
--- a/marketplace/code/model/base_entities/IMarketPlaceAllowedInstance.php
+++ b/marketplace/code/model/base_entities/IMarketPlaceAllowedInstance.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketPlaceType.php b/marketplace/code/model/base_entities/IMarketPlaceType.php
index 41e1667..52a0be8 100644
--- a/marketplace/code/model/base_entities/IMarketPlaceType.php
+++ b/marketplace/code/model/base_entities/IMarketPlaceType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketPlaceVideo.php b/marketplace/code/model/base_entities/IMarketPlaceVideo.php
index b4d67c9..a341231 100644
--- a/marketplace/code/model/base_entities/IMarketPlaceVideo.php
+++ b/marketplace/code/model/base_entities/IMarketPlaceVideo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketPlaceVideoType.php b/marketplace/code/model/base_entities/IMarketPlaceVideoType.php
index 88b457a..987307f 100644
--- a/marketplace/code/model/base_entities/IMarketPlaceVideoType.php
+++ b/marketplace/code/model/base_entities/IMarketPlaceVideoType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketplaceFactory.php b/marketplace/code/model/base_entities/IMarketplaceFactory.php
index 942a910..cfbbed2 100644
--- a/marketplace/code/model/base_entities/IMarketplaceFactory.php
+++ b/marketplace/code/model/base_entities/IMarketplaceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IMarketplaceTypeRepository.php b/marketplace/code/model/base_entities/IMarketplaceTypeRepository.php
index 1b6d434..a80cb21 100644
--- a/marketplace/code/model/base_entities/IMarketplaceTypeRepository.php
+++ b/marketplace/code/model/base_entities/IMarketplaceTypeRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IOpenStackImplementation.php b/marketplace/code/model/base_entities/IOpenStackImplementation.php
index b4aef7b..ce17b40 100644
--- a/marketplace/code/model/base_entities/IOpenStackImplementation.php
+++ b/marketplace/code/model/base_entities/IOpenStackImplementation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IOpenStackImplementationApiCoverage.php b/marketplace/code/model/base_entities/IOpenStackImplementationApiCoverage.php
index e2937e7..6d3457f 100644
--- a/marketplace/code/model/base_entities/IOpenStackImplementationApiCoverage.php
+++ b/marketplace/code/model/base_entities/IOpenStackImplementationApiCoverage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IOpenStackImplementationFactory.php b/marketplace/code/model/base_entities/IOpenStackImplementationFactory.php
index 6151402..977e82a 100644
--- a/marketplace/code/model/base_entities/IOpenStackImplementationFactory.php
+++ b/marketplace/code/model/base_entities/IOpenStackImplementationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IOpenStackImplementationRepository.php b/marketplace/code/model/base_entities/IOpenStackImplementationRepository.php
index 17f12c0..04ba8b6 100644
--- a/marketplace/code/model/base_entities/IOpenStackImplementationRepository.php
+++ b/marketplace/code/model/base_entities/IOpenStackImplementationRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IRegion.php b/marketplace/code/model/base_entities/IRegion.php
index 789a006..a661b71 100644
--- a/marketplace/code/model/base_entities/IRegion.php
+++ b/marketplace/code/model/base_entities/IRegion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IRegionalSupport.php b/marketplace/code/model/base_entities/IRegionalSupport.php
index 2cec9b3..e19d663 100644
--- a/marketplace/code/model/base_entities/IRegionalSupport.php
+++ b/marketplace/code/model/base_entities/IRegionalSupport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IRegionalSupportedCompanyService.php b/marketplace/code/model/base_entities/IRegionalSupportedCompanyService.php
index 48134ec..6b5b6ed 100644
--- a/marketplace/code/model/base_entities/IRegionalSupportedCompanyService.php
+++ b/marketplace/code/model/base_entities/IRegionalSupportedCompanyService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/IRegionalSupportedCompanyServiceFactory.php b/marketplace/code/model/base_entities/IRegionalSupportedCompanyServiceFactory.php
index 07b4b30..0504fd1 100644
--- a/marketplace/code/model/base_entities/IRegionalSupportedCompanyServiceFactory.php
+++ b/marketplace/code/model/base_entities/IRegionalSupportedCompanyServiceFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ISecurityGroup.php b/marketplace/code/model/base_entities/ISecurityGroup.php
index f05327d..15570f4 100644
--- a/marketplace/code/model/base_entities/ISecurityGroup.php
+++ b/marketplace/code/model/base_entities/ISecurityGroup.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ISecurityGroupRepository.php b/marketplace/code/model/base_entities/ISecurityGroupRepository.php
index 985c1a4..f7ff14d 100644
--- a/marketplace/code/model/base_entities/ISecurityGroupRepository.php
+++ b/marketplace/code/model/base_entities/ISecurityGroupRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/ISupportChannelType.php b/marketplace/code/model/base_entities/ISupportChannelType.php
index aa8e8d4..57cfdbd 100644
--- a/marketplace/code/model/base_entities/ISupportChannelType.php
+++ b/marketplace/code/model/base_entities/ISupportChannelType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/MarketPlaceVideoTypeManager.php b/marketplace/code/model/base_entities/MarketPlaceVideoTypeManager.php
index ab71a7f..d0df825 100644
--- a/marketplace/code/model/base_entities/MarketPlaceVideoTypeManager.php
+++ b/marketplace/code/model/base_entities/MarketPlaceVideoTypeManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/MarketplaceTypeManager.php b/marketplace/code/model/base_entities/MarketplaceTypeManager.php
index 1e14461..ca7cc8f 100644
--- a/marketplace/code/model/base_entities/MarketplaceTypeManager.php
+++ b/marketplace/code/model/base_entities/MarketplaceTypeManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/base_entities/RegionalSupportedCompanyServiceManager.php b/marketplace/code/model/base_entities/RegionalSupportedCompanyServiceManager.php
index 3888ce3..5b496a9 100644
--- a/marketplace/code/model/base_entities/RegionalSupportedCompanyServiceManager.php
+++ b/marketplace/code/model/base_entities/RegionalSupportedCompanyServiceManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/CloudManager.php b/marketplace/code/model/clouds/CloudManager.php
index f840b72..027d915 100644
--- a/marketplace/code/model/clouds/CloudManager.php
+++ b/marketplace/code/model/clouds/CloudManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IAvailabilityZone.php b/marketplace/code/model/clouds/IAvailabilityZone.php
index 688f245..351bc11 100644
--- a/marketplace/code/model/clouds/IAvailabilityZone.php
+++ b/marketplace/code/model/clouds/IAvailabilityZone.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/ICloudFactory.php b/marketplace/code/model/clouds/ICloudFactory.php
index af28de4..f80d557 100644
--- a/marketplace/code/model/clouds/ICloudFactory.php
+++ b/marketplace/code/model/clouds/ICloudFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/ICloudService.php b/marketplace/code/model/clouds/ICloudService.php
index 7924f8e..6eba63f 100644
--- a/marketplace/code/model/clouds/ICloudService.php
+++ b/marketplace/code/model/clouds/ICloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/ICloudServiceOffered.php b/marketplace/code/model/clouds/ICloudServiceOffered.php
index a376141..55af848 100644
--- a/marketplace/code/model/clouds/ICloudServiceOffered.php
+++ b/marketplace/code/model/clouds/ICloudServiceOffered.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IDataCenterLocation.php b/marketplace/code/model/clouds/IDataCenterLocation.php
index a1b945b..4dc343b 100644
--- a/marketplace/code/model/clouds/IDataCenterLocation.php
+++ b/marketplace/code/model/clouds/IDataCenterLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IDataCenterRegion.php b/marketplace/code/model/clouds/IDataCenterRegion.php
index 836eed4..779b9ff 100644
--- a/marketplace/code/model/clouds/IDataCenterRegion.php
+++ b/marketplace/code/model/clouds/IDataCenterRegion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IPricingSchemaType.php b/marketplace/code/model/clouds/IPricingSchemaType.php
index 9834b1f..3f34046 100644
--- a/marketplace/code/model/clouds/IPricingSchemaType.php
+++ b/marketplace/code/model/clouds/IPricingSchemaType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IPrivateCloudService.php b/marketplace/code/model/clouds/IPrivateCloudService.php
index 5cf95cf..ebceb1c 100644
--- a/marketplace/code/model/clouds/IPrivateCloudService.php
+++ b/marketplace/code/model/clouds/IPrivateCloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IPublicCloudFactory.php b/marketplace/code/model/clouds/IPublicCloudFactory.php
index 76bcf6b..89a5601 100644
--- a/marketplace/code/model/clouds/IPublicCloudFactory.php
+++ b/marketplace/code/model/clouds/IPublicCloudFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IPublicCloudService.php b/marketplace/code/model/clouds/IPublicCloudService.php
index 9fe41f5..7f594e9 100644
--- a/marketplace/code/model/clouds/IPublicCloudService.php
+++ b/marketplace/code/model/clouds/IPublicCloudService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/IPublicCloudServiceOffered.php b/marketplace/code/model/clouds/IPublicCloudServiceOffered.php
index 46fe24e..e3b9e3e 100644
--- a/marketplace/code/model/clouds/IPublicCloudServiceOffered.php
+++ b/marketplace/code/model/clouds/IPublicCloudServiceOffered.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/PrivateCloudManager.php b/marketplace/code/model/clouds/PrivateCloudManager.php
index 206716f..974c834 100644
--- a/marketplace/code/model/clouds/PrivateCloudManager.php
+++ b/marketplace/code/model/clouds/PrivateCloudManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/clouds/PublicCloudManager.php b/marketplace/code/model/clouds/PublicCloudManager.php
index 85bb4c5..9c1ecb3 100644
--- a/marketplace/code/model/clouds/PublicCloudManager.php
+++ b/marketplace/code/model/clouds/PublicCloudManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/AddressInfo.php b/marketplace/code/model/consultants/AddressInfo.php
index dda7356..9593983 100644
--- a/marketplace/code/model/consultants/AddressInfo.php
+++ b/marketplace/code/model/consultants/AddressInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/ConsultantManager.php b/marketplace/code/model/consultants/ConsultantManager.php
index 2769874..f196851 100644
--- a/marketplace/code/model/consultants/ConsultantManager.php
+++ b/marketplace/code/model/consultants/ConsultantManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IConfigurationManagementType.php b/marketplace/code/model/consultants/IConfigurationManagementType.php
index 1c49583..fb5808d 100644
--- a/marketplace/code/model/consultants/IConfigurationManagementType.php
+++ b/marketplace/code/model/consultants/IConfigurationManagementType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IConsultant.php b/marketplace/code/model/consultants/IConsultant.php
index cd43fc3..3379d4a 100644
--- a/marketplace/code/model/consultants/IConsultant.php
+++ b/marketplace/code/model/consultants/IConsultant.php
@@ -1,6 +1,6 @@
 <?
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IConsultantClient.php b/marketplace/code/model/consultants/IConsultantClient.php
index d47f04b..5f8fa85 100644
--- a/marketplace/code/model/consultants/IConsultantClient.php
+++ b/marketplace/code/model/consultants/IConsultantClient.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IConsultantFactory.php b/marketplace/code/model/consultants/IConsultantFactory.php
index a8cfdfe..c7c5a0e 100644
--- a/marketplace/code/model/consultants/IConsultantFactory.php
+++ b/marketplace/code/model/consultants/IConsultantFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IConsultantServiceOfferedType.php b/marketplace/code/model/consultants/IConsultantServiceOfferedType.php
index ceef2e3..0e7c1ba 100644
--- a/marketplace/code/model/consultants/IConsultantServiceOfferedType.php
+++ b/marketplace/code/model/consultants/IConsultantServiceOfferedType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/IOffice.php b/marketplace/code/model/consultants/IOffice.php
index 7e033ec..02db30d 100644
--- a/marketplace/code/model/consultants/IOffice.php
+++ b/marketplace/code/model/consultants/IOffice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/ISpokenLanguage.php b/marketplace/code/model/consultants/ISpokenLanguage.php
index 137615c..286e3b2 100644
--- a/marketplace/code/model/consultants/ISpokenLanguage.php
+++ b/marketplace/code/model/consultants/ISpokenLanguage.php
@@ -1,5 +1,5 @@
 <?php/**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/consultants/ISpokenLanguageRepository.php b/marketplace/code/model/consultants/ISpokenLanguageRepository.php
index 8ed3610..2b904f6 100644
--- a/marketplace/code/model/consultants/ISpokenLanguageRepository.php
+++ b/marketplace/code/model/consultants/ISpokenLanguageRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/distribution/ApplianceManager.php b/marketplace/code/model/distribution/ApplianceManager.php
index 58dc89f..ade3b6c 100644
--- a/marketplace/code/model/distribution/ApplianceManager.php
+++ b/marketplace/code/model/distribution/ApplianceManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/distribution/DistributionManager.php b/marketplace/code/model/distribution/DistributionManager.php
index 667e49f..294798d 100644
--- a/marketplace/code/model/distribution/DistributionManager.php
+++ b/marketplace/code/model/distribution/DistributionManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/distribution/IAppliance.php b/marketplace/code/model/distribution/IAppliance.php
index b725770..cebb10f 100644
--- a/marketplace/code/model/distribution/IAppliance.php
+++ b/marketplace/code/model/distribution/IAppliance.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/distribution/IDistribution.php b/marketplace/code/model/distribution/IDistribution.php
index fae276b..84c1a6b 100644
--- a/marketplace/code/model/distribution/IDistribution.php
+++ b/marketplace/code/model/distribution/IDistribution.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/exceptions/NonSupportedApiVersion.php b/marketplace/code/model/exceptions/NonSupportedApiVersion.php
index a1e59c7..f1e8a3a 100644
--- a/marketplace/code/model/exceptions/NonSupportedApiVersion.php
+++ b/marketplace/code/model/exceptions/NonSupportedApiVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/exceptions/NonSupportedComponent.php b/marketplace/code/model/exceptions/NonSupportedComponent.php
index 781ff90..ac39088 100644
--- a/marketplace/code/model/exceptions/NonSupportedComponent.php
+++ b/marketplace/code/model/exceptions/NonSupportedComponent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/exceptions/NotAllowedMarketplaceTypeException.php b/marketplace/code/model/exceptions/NotAllowedMarketplaceTypeException.php
index 721bc22..fcb84ee 100644
--- a/marketplace/code/model/exceptions/NotAllowedMarketplaceTypeException.php
+++ b/marketplace/code/model/exceptions/NotAllowedMarketplaceTypeException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackApiFactory.php b/marketplace/code/model/openstack_releases/IOpenStackApiFactory.php
index 0ac40b7..c08db7a 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackApiFactory.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackApiFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackApiVersion.php b/marketplace/code/model/openstack_releases/IOpenStackApiVersion.php
index 5d0d5f0..311c2ba 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackApiVersion.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackApiVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackApiVersionRepository.php b/marketplace/code/model/openstack_releases/IOpenStackApiVersionRepository.php
index c953e0c..7a0b31f 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackApiVersionRepository.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackApiVersionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackComponent.php b/marketplace/code/model/openstack_releases/IOpenStackComponent.php
index b9e4076..8e7bbf2 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackComponent.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackComponent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackComponentRepository.php b/marketplace/code/model/openstack_releases/IOpenStackComponentRepository.php
index ca9c682..3e9e066 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackComponentRepository.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackComponentRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackRelease.php b/marketplace/code/model/openstack_releases/IOpenStackRelease.php
index 7e87fd8..9c1bf70 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackRelease.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackRelease.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackReleaseRepository.php b/marketplace/code/model/openstack_releases/IOpenStackReleaseRepository.php
index cb90dc3..e5238ad 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackReleaseRepository.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackReleaseRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IOpenStackReleaseSupportedApiVersionRepository.php b/marketplace/code/model/openstack_releases/IOpenStackReleaseSupportedApiVersionRepository.php
index 1be304f..38b01ad 100644
--- a/marketplace/code/model/openstack_releases/IOpenStackReleaseSupportedApiVersionRepository.php
+++ b/marketplace/code/model/openstack_releases/IOpenStackReleaseSupportedApiVersionRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/IReleaseSupportedApiVersion.php b/marketplace/code/model/openstack_releases/IReleaseSupportedApiVersion.php
index a74d82a..6f7535e 100644
--- a/marketplace/code/model/openstack_releases/IReleaseSupportedApiVersion.php
+++ b/marketplace/code/model/openstack_releases/IReleaseSupportedApiVersion.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/openstack_releases/OpenStackApiManager.php b/marketplace/code/model/openstack_releases/OpenStackApiManager.php
index 3ad73ed..1ad1de9 100644
--- a/marketplace/code/model/openstack_releases/OpenStackApiManager.php
+++ b/marketplace/code/model/openstack_releases/OpenStackApiManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/strategies/ICompanyServiceCanAddResourcePolicy.php b/marketplace/code/model/strategies/ICompanyServiceCanAddResourcePolicy.php
index 4a79f02..b4f6393 100644
--- a/marketplace/code/model/strategies/ICompanyServiceCanAddResourcePolicy.php
+++ b/marketplace/code/model/strategies/ICompanyServiceCanAddResourcePolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/strategies/ICompanyServiceCanAddVideoPolicy.php b/marketplace/code/model/strategies/ICompanyServiceCanAddVideoPolicy.php
index 38373b5..b70e7b3 100644
--- a/marketplace/code/model/strategies/ICompanyServiceCanAddVideoPolicy.php
+++ b/marketplace/code/model/strategies/ICompanyServiceCanAddVideoPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/strategies/IMarketPlaceTypeAddPolicy.php b/marketplace/code/model/strategies/IMarketPlaceTypeAddPolicy.php
index a7dab8d..1247e37 100644
--- a/marketplace/code/model/strategies/IMarketPlaceTypeAddPolicy.php
+++ b/marketplace/code/model/strategies/IMarketPlaceTypeAddPolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/strategies/IMarketPlaceTypeCanShowInstancePolicy.php b/marketplace/code/model/strategies/IMarketPlaceTypeCanShowInstancePolicy.php
index 62f08f0..a3da1a5 100644
--- a/marketplace/code/model/strategies/IMarketPlaceTypeCanShowInstancePolicy.php
+++ b/marketplace/code/model/strategies/IMarketPlaceTypeCanShowInstancePolicy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/CourseDTO.php b/marketplace/code/model/training/CourseDTO.php
index f436690..a3b654e 100644
--- a/marketplace/code/model/training/CourseDTO.php
+++ b/marketplace/code/model/training/CourseDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/CourseManager.php b/marketplace/code/model/training/CourseManager.php
index 9640897..6a93880 100644
--- a/marketplace/code/model/training/CourseManager.php
+++ b/marketplace/code/model/training/CourseManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ICourse.php b/marketplace/code/model/training/ICourse.php
index 7833124..5e8bfce 100644
--- a/marketplace/code/model/training/ICourse.php
+++ b/marketplace/code/model/training/ICourse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ICourseLocation.php b/marketplace/code/model/training/ICourseLocation.php
index e9ed4db..1a33a0d 100644
--- a/marketplace/code/model/training/ICourseLocation.php
+++ b/marketplace/code/model/training/ICourseLocation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ICourseRelatedProject.php b/marketplace/code/model/training/ICourseRelatedProject.php
index dc80e13..8d5a73a 100644
--- a/marketplace/code/model/training/ICourseRelatedProject.php
+++ b/marketplace/code/model/training/ICourseRelatedProject.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ICourseRepository.php b/marketplace/code/model/training/ICourseRepository.php
index 8e0057a..4bf67f7 100644
--- a/marketplace/code/model/training/ICourseRepository.php
+++ b/marketplace/code/model/training/ICourseRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/IScheduleTime.php b/marketplace/code/model/training/IScheduleTime.php
index f5c9c52..d022c3c 100644
--- a/marketplace/code/model/training/IScheduleTime.php
+++ b/marketplace/code/model/training/IScheduleTime.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITraining.php b/marketplace/code/model/training/ITraining.php
index 2915a6f..b0a115a 100644
--- a/marketplace/code/model/training/ITraining.php
+++ b/marketplace/code/model/training/ITraining.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingAdministrator.php b/marketplace/code/model/training/ITrainingAdministrator.php
index b3ef18d..905d2bf 100644
--- a/marketplace/code/model/training/ITrainingAdministrator.php
+++ b/marketplace/code/model/training/ITrainingAdministrator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingCourseLevel.php b/marketplace/code/model/training/ITrainingCourseLevel.php
index 4181ff3..42ee335 100644
--- a/marketplace/code/model/training/ITrainingCourseLevel.php
+++ b/marketplace/code/model/training/ITrainingCourseLevel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingCoursePrerequisite.php b/marketplace/code/model/training/ITrainingCoursePrerequisite.php
index baf181d..f782a4b 100644
--- a/marketplace/code/model/training/ITrainingCoursePrerequisite.php
+++ b/marketplace/code/model/training/ITrainingCoursePrerequisite.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingCourseType.php b/marketplace/code/model/training/ITrainingCourseType.php
index 7f45761..eb77c5b 100644
--- a/marketplace/code/model/training/ITrainingCourseType.php
+++ b/marketplace/code/model/training/ITrainingCourseType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingFactory.php b/marketplace/code/model/training/ITrainingFactory.php
index beb8161..7981783 100644
--- a/marketplace/code/model/training/ITrainingFactory.php
+++ b/marketplace/code/model/training/ITrainingFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/ITrainingRepository.php b/marketplace/code/model/training/ITrainingRepository.php
index 7aa6694..1e54777 100644
--- a/marketplace/code/model/training/ITrainingRepository.php
+++ b/marketplace/code/model/training/ITrainingRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/SearchDTO.php b/marketplace/code/model/training/SearchDTO.php
index a1a2a90..b87bb4f 100644
--- a/marketplace/code/model/training/SearchDTO.php
+++ b/marketplace/code/model/training/SearchDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/TrainingCourseLocationDTO.php b/marketplace/code/model/training/TrainingCourseLocationDTO.php
index 428e5d2..61a46d0 100644
--- a/marketplace/code/model/training/TrainingCourseLocationDTO.php
+++ b/marketplace/code/model/training/TrainingCourseLocationDTO.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/model/training/TrainingManager.php b/marketplace/code/model/training/TrainingManager.php
index f587245..f167f16 100644
--- a/marketplace/code/model/training/TrainingManager.php
+++ b/marketplace/code/model/training/TrainingManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/ConfigurationManagementTypeAdminUI.php b/marketplace/code/ui/admin/ConfigurationManagementTypeAdminUI.php
index fcb9377..7e024e8 100644
--- a/marketplace/code/ui/admin/ConfigurationManagementTypeAdminUI.php
+++ b/marketplace/code/ui/admin/ConfigurationManagementTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/GuestOSTypeAdminUI.php b/marketplace/code/ui/admin/GuestOSTypeAdminUI.php
index 196c265..97e161d 100644
--- a/marketplace/code/ui/admin/GuestOSTypeAdminUI.php
+++ b/marketplace/code/ui/admin/GuestOSTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/HyperVisorTypeAdminUI.php b/marketplace/code/ui/admin/HyperVisorTypeAdminUI.php
index 4243abe..b61e1fc 100644
--- a/marketplace/code/ui/admin/HyperVisorTypeAdminUI.php
+++ b/marketplace/code/ui/admin/HyperVisorTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/MarketPlaceAdminPage.php b/marketplace/code/ui/admin/MarketPlaceAdminPage.php
index e2180e6..918a860 100644
--- a/marketplace/code/ui/admin/MarketPlaceAdminPage.php
+++ b/marketplace/code/ui/admin/MarketPlaceAdminPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/MarketPlaceAllowedInstanceAdminUI.php b/marketplace/code/ui/admin/MarketPlaceAllowedInstanceAdminUI.php
index c51ead7..49dac97 100644
--- a/marketplace/code/ui/admin/MarketPlaceAllowedInstanceAdminUI.php
+++ b/marketplace/code/ui/admin/MarketPlaceAllowedInstanceAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/MarketPlaceTypeAdminUI.php b/marketplace/code/ui/admin/MarketPlaceTypeAdminUI.php
index 3421130..131da28 100644
--- a/marketplace/code/ui/admin/MarketPlaceTypeAdminUI.php
+++ b/marketplace/code/ui/admin/MarketPlaceTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/MarketPlaceVideoTypeAdminUI.php b/marketplace/code/ui/admin/MarketPlaceVideoTypeAdminUI.php
index 9ee93ad..c5529b5 100644
--- a/marketplace/code/ui/admin/MarketPlaceVideoTypeAdminUI.php
+++ b/marketplace/code/ui/admin/MarketPlaceVideoTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/MarketplaceModelAdmin.php b/marketplace/code/ui/admin/MarketplaceModelAdmin.php
index ae83d8b..87080eb 100644
--- a/marketplace/code/ui/admin/MarketplaceModelAdmin.php
+++ b/marketplace/code/ui/admin/MarketplaceModelAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/OpenStackApiVersionAdminUI.php b/marketplace/code/ui/admin/OpenStackApiVersionAdminUI.php
index 55d8af3..3726cb3 100644
--- a/marketplace/code/ui/admin/OpenStackApiVersionAdminUI.php
+++ b/marketplace/code/ui/admin/OpenStackApiVersionAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/OpenStackComponentAdminUI.php b/marketplace/code/ui/admin/OpenStackComponentAdminUI.php
index 59e2be7..3dd94cf 100644
--- a/marketplace/code/ui/admin/OpenStackComponentAdminUI.php
+++ b/marketplace/code/ui/admin/OpenStackComponentAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/OpenStackReleaseAdminUI.php b/marketplace/code/ui/admin/OpenStackReleaseAdminUI.php
index cf046d2..fd48405 100644
--- a/marketplace/code/ui/admin/OpenStackReleaseAdminUI.php
+++ b/marketplace/code/ui/admin/OpenStackReleaseAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/OpenStackReleaseSupportedApiVersionAdminUI.php b/marketplace/code/ui/admin/OpenStackReleaseSupportedApiVersionAdminUI.php
index 96c8fb6..17c42a6 100644
--- a/marketplace/code/ui/admin/OpenStackReleaseSupportedApiVersionAdminUI.php
+++ b/marketplace/code/ui/admin/OpenStackReleaseSupportedApiVersionAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/PricingSchemaTypeAdminUI.php b/marketplace/code/ui/admin/PricingSchemaTypeAdminUI.php
index bf96b01..76d4936 100644
--- a/marketplace/code/ui/admin/PricingSchemaTypeAdminUI.php
+++ b/marketplace/code/ui/admin/PricingSchemaTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/RegionAdminUI.php b/marketplace/code/ui/admin/RegionAdminUI.php
index e6d7d99..2d266f9 100644
--- a/marketplace/code/ui/admin/RegionAdminUI.php
+++ b/marketplace/code/ui/admin/RegionAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/SpokenLanguageAdminUI.php b/marketplace/code/ui/admin/SpokenLanguageAdminUI.php
index 4868664..557f9e1 100644
--- a/marketplace/code/ui/admin/SpokenLanguageAdminUI.php
+++ b/marketplace/code/ui/admin/SpokenLanguageAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/SupportChannelTypeAdminUI.php b/marketplace/code/ui/admin/SupportChannelTypeAdminUI.php
index f7c9586..7ff14bc 100644
--- a/marketplace/code/ui/admin/SupportChannelTypeAdminUI.php
+++ b/marketplace/code/ui/admin/SupportChannelTypeAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/TrainingCourseAdminUI.php b/marketplace/code/ui/admin/TrainingCourseAdminUI.php
index 84b9f56..5666489 100644
--- a/marketplace/code/ui/admin/TrainingCourseAdminUI.php
+++ b/marketplace/code/ui/admin/TrainingCourseAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/TrainingCourseScheduleAdminUI.php b/marketplace/code/ui/admin/TrainingCourseScheduleAdminUI.php
index a460032..9439f61 100644
--- a/marketplace/code/ui/admin/TrainingCourseScheduleAdminUI.php
+++ b/marketplace/code/ui/admin/TrainingCourseScheduleAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/TrainingServiceAdminUI.php b/marketplace/code/ui/admin/TrainingServiceAdminUI.php
index 63c9478..96cd3d1 100644
--- a/marketplace/code/ui/admin/TrainingServiceAdminUI.php
+++ b/marketplace/code/ui/admin/TrainingServiceAdminUI.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/additional.resources.js b/marketplace/code/ui/admin/js/additional.resources.js
index a8e0aba..3620049 100644
--- a/marketplace/code/ui/admin/js/additional.resources.js
+++ b/marketplace/code/ui/admin/js/additional.resources.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/appliance.js b/marketplace/code/ui/admin/js/appliance.js
index 49c7a39..8bca3be 100644
--- a/marketplace/code/ui/admin/js/appliance.js
+++ b/marketplace/code/ui/admin/js/appliance.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/components.js b/marketplace/code/ui/admin/js/components.js
index e78975c..a58dbe6 100644
--- a/marketplace/code/ui/admin/js/components.js
+++ b/marketplace/code/ui/admin/js/components.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/configuration.management.expertise.js b/marketplace/code/ui/admin/js/configuration.management.expertise.js
index 7754162..92ebce5 100644
--- a/marketplace/code/ui/admin/js/configuration.management.expertise.js
+++ b/marketplace/code/ui/admin/js/configuration.management.expertise.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/consultant.js b/marketplace/code/ui/admin/js/consultant.js
index 21fcbf3..485d1cd 100644
--- a/marketplace/code/ui/admin/js/consultant.js
+++ b/marketplace/code/ui/admin/js/consultant.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/consultants.js b/marketplace/code/ui/admin/js/consultants.js
index c132d5e..3983b04 100644
--- a/marketplace/code/ui/admin/js/consultants.js
+++ b/marketplace/code/ui/admin/js/consultants.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/datacenter.locations.js b/marketplace/code/ui/admin/js/datacenter.locations.js
index 7231349..c1a9355 100644
--- a/marketplace/code/ui/admin/js/datacenter.locations.js
+++ b/marketplace/code/ui/admin/js/datacenter.locations.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/distribution.js b/marketplace/code/ui/admin/js/distribution.js
index acfdc0d..6152789 100644
--- a/marketplace/code/ui/admin/js/distribution.js
+++ b/marketplace/code/ui/admin/js/distribution.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/expertise.areas.js b/marketplace/code/ui/admin/js/expertise.areas.js
index a62a675..5913a43 100644
--- a/marketplace/code/ui/admin/js/expertise.areas.js
+++ b/marketplace/code/ui/admin/js/expertise.areas.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/geocoding.jquery.js b/marketplace/code/ui/admin/js/geocoding.jquery.js
index b3af2af..e469954 100644
--- a/marketplace/code/ui/admin/js/geocoding.jquery.js
+++ b/marketplace/code/ui/admin/js/geocoding.jquery.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/guest.os.js b/marketplace/code/ui/admin/js/guest.os.js
index 1cca0d7..06a171a 100644
--- a/marketplace/code/ui/admin/js/guest.os.js
+++ b/marketplace/code/ui/admin/js/guest.os.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/hypervisors.js b/marketplace/code/ui/admin/js/hypervisors.js
index 11c76d7..700717a 100644
--- a/marketplace/code/ui/admin/js/hypervisors.js
+++ b/marketplace/code/ui/admin/js/hypervisors.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/implementations.js b/marketplace/code/ui/admin/js/implementations.js
index a169a5c..33d2173 100644
--- a/marketplace/code/ui/admin/js/implementations.js
+++ b/marketplace/code/ui/admin/js/implementations.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/layout.js b/marketplace/code/ui/admin/js/layout.js
index 9397358..645cd88 100644
--- a/marketplace/code/ui/admin/js/layout.js
+++ b/marketplace/code/ui/admin/js/layout.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/marketplace.type.header.js b/marketplace/code/ui/admin/js/marketplace.type.header.js
index 05d0c5f..76521e6 100644
--- a/marketplace/code/ui/admin/js/marketplace.type.header.js
+++ b/marketplace/code/ui/admin/js/marketplace.type.header.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/marketplaceadmin.js b/marketplace/code/ui/admin/js/marketplaceadmin.js
index cd56cb6..58e113a 100644
--- a/marketplace/code/ui/admin/js/marketplaceadmin.js
+++ b/marketplace/code/ui/admin/js/marketplaceadmin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/offices.js b/marketplace/code/ui/admin/js/offices.js
index ebe696e..dedf633 100644
--- a/marketplace/code/ui/admin/js/offices.js
+++ b/marketplace/code/ui/admin/js/offices.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/pricing.schemas.js b/marketplace/code/ui/admin/js/pricing.schemas.js
index 51b63e0..b4ddc90 100644
--- a/marketplace/code/ui/admin/js/pricing.schemas.js
+++ b/marketplace/code/ui/admin/js/pricing.schemas.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/private_cloud.js b/marketplace/code/ui/admin/js/private_cloud.js
index c49e239..ff4df94 100644
--- a/marketplace/code/ui/admin/js/private_cloud.js
+++ b/marketplace/code/ui/admin/js/private_cloud.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/private_clouds.js b/marketplace/code/ui/admin/js/private_clouds.js
index 947a140..f0359fc 100644
--- a/marketplace/code/ui/admin/js/private_clouds.js
+++ b/marketplace/code/ui/admin/js/private_clouds.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/public_cloud.js b/marketplace/code/ui/admin/js/public_cloud.js
index 2cbc8ec..8cab1bf 100644
--- a/marketplace/code/ui/admin/js/public_cloud.js
+++ b/marketplace/code/ui/admin/js/public_cloud.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/public_clouds.js b/marketplace/code/ui/admin/js/public_clouds.js
index fe533ac..989ff0d 100644
--- a/marketplace/code/ui/admin/js/public_clouds.js
+++ b/marketplace/code/ui/admin/js/public_clouds.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/querystring.jquery.js b/marketplace/code/ui/admin/js/querystring.jquery.js
index 86dce83..62cec04 100644
--- a/marketplace/code/ui/admin/js/querystring.jquery.js
+++ b/marketplace/code/ui/admin/js/querystring.jquery.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/reference.clients.js b/marketplace/code/ui/admin/js/reference.clients.js
index 25be1a6..5d97467 100644
--- a/marketplace/code/ui/admin/js/reference.clients.js
+++ b/marketplace/code/ui/admin/js/reference.clients.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/services.offered.js b/marketplace/code/ui/admin/js/services.offered.js
index 7353de0..49b4cef 100644
--- a/marketplace/code/ui/admin/js/services.offered.js
+++ b/marketplace/code/ui/admin/js/services.offered.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/spoken.languages.js b/marketplace/code/ui/admin/js/spoken.languages.js
index d74ab70..6f7e1df 100644
--- a/marketplace/code/ui/admin/js/spoken.languages.js
+++ b/marketplace/code/ui/admin/js/spoken.languages.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/support.channels.js b/marketplace/code/ui/admin/js/support.channels.js
index 2839653..75ae53e 100644
--- a/marketplace/code/ui/admin/js/support.channels.js
+++ b/marketplace/code/ui/admin/js/support.channels.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/utils.js b/marketplace/code/ui/admin/js/utils.js
index d3bf2f7..416c67a 100644
--- a/marketplace/code/ui/admin/js/utils.js
+++ b/marketplace/code/ui/admin/js/utils.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/admin/js/videos.js b/marketplace/code/ui/admin/js/videos.js
index 882956f..7f2f10a 100644
--- a/marketplace/code/ui/admin/js/videos.js
+++ b/marketplace/code/ui/admin/js/videos.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php b/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
index 61bf351..7233eb6 100644
--- a/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
+++ b/marketplace/code/ui/frontend/CloudsDirectoryPage_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php b/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
index d089a6d..9638d85 100644
--- a/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/ConsultantsDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/DistributionsDirectoryPage.php b/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
index 028b898..f706e8d 100644
--- a/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/DistributionsDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/MarketPlaceDirectoryPage.php b/marketplace/code/ui/frontend/MarketPlaceDirectoryPage.php
index 81729a2..aaca943 100644
--- a/marketplace/code/ui/frontend/MarketPlaceDirectoryPage.php
+++ b/marketplace/code/ui/frontend/MarketPlaceDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/MarketPlaceDriverPage.php b/marketplace/code/ui/frontend/MarketPlaceDriverPage.php
index 35a4fa1..cbbbf40 100644
--- a/marketplace/code/ui/frontend/MarketPlaceDriverPage.php
+++ b/marketplace/code/ui/frontend/MarketPlaceDriverPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/MarketPlaceLandingPage.php b/marketplace/code/ui/frontend/MarketPlaceLandingPage.php
index 6b665d3..3508e78 100644
--- a/marketplace/code/ui/frontend/MarketPlaceLandingPage.php
+++ b/marketplace/code/ui/frontend/MarketPlaceLandingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/MarketPlacePage.php b/marketplace/code/ui/frontend/MarketPlacePage.php
index 5b9ae67..e78d9a0 100644
--- a/marketplace/code/ui/frontend/MarketPlacePage.php
+++ b/marketplace/code/ui/frontend/MarketPlacePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php b/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
index f5e2290..63e1199 100644
--- a/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/PrivateCloudsDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php b/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
index ce1efb0..f880b16 100644
--- a/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
+++ b/marketplace/code/ui/frontend/PublicCloudsDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/TrainingDirectoryPage.php b/marketplace/code/ui/frontend/TrainingDirectoryPage.php
index bbe585c..4564755 100644
--- a/marketplace/code/ui/frontend/TrainingDirectoryPage.php
+++ b/marketplace/code/ui/frontend/TrainingDirectoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/cloud.page.js b/marketplace/code/ui/frontend/js/cloud.page.js
index fb2060e..2e7f275 100644
--- a/marketplace/code/ui/frontend/js/cloud.page.js
+++ b/marketplace/code/ui/frontend/js/cloud.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/clouds.directory.page.js b/marketplace/code/ui/frontend/js/clouds.directory.page.js
index 21ba8c9..0f36b9c 100644
--- a/marketplace/code/ui/frontend/js/clouds.directory.page.js
+++ b/marketplace/code/ui/frontend/js/clouds.directory.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/consultant.page.js b/marketplace/code/ui/frontend/js/consultant.page.js
index 4190a88..f1708ee 100644
--- a/marketplace/code/ui/frontend/js/consultant.page.js
+++ b/marketplace/code/ui/frontend/js/consultant.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/consultants.directory.page.js b/marketplace/code/ui/frontend/js/consultants.directory.page.js
index 63be84e..b99396c 100644
--- a/marketplace/code/ui/frontend/js/consultants.directory.page.js
+++ b/marketplace/code/ui/frontend/js/consultants.directory.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/google.maps.jquery.js b/marketplace/code/ui/frontend/js/google.maps.jquery.js
index b1da6ca..0905abb 100644
--- a/marketplace/code/ui/frontend/js/google.maps.jquery.js
+++ b/marketplace/code/ui/frontend/js/google.maps.jquery.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/implementation.directory.page.js b/marketplace/code/ui/frontend/js/implementation.directory.page.js
index f68baa9..6997845 100644
--- a/marketplace/code/ui/frontend/js/implementation.directory.page.js
+++ b/marketplace/code/ui/frontend/js/implementation.directory.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/implementation.page.js b/marketplace/code/ui/frontend/js/implementation.page.js
index 37298da..a38f69f 100644
--- a/marketplace/code/ui/frontend/js/implementation.page.js
+++ b/marketplace/code/ui/frontend/js/implementation.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/landing.page.js b/marketplace/code/ui/frontend/js/landing.page.js
index 608ab58..130e5ad 100644
--- a/marketplace/code/ui/frontend/js/landing.page.js
+++ b/marketplace/code/ui/frontend/js/landing.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js b/marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js
index c27f633..91470d6 100644
--- a/marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js
+++ b/marketplace/code/ui/frontend/js/openstack.implementation.capabilities.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/js/training.directory.page.js b/marketplace/code/ui/frontend/js/training.directory.page.js
index e403d83..2b33433 100644
--- a/marketplace/code/ui/frontend/js/training.directory.page.js
+++ b/marketplace/code/ui/frontend/js/training.directory.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/view_models/CompanyViewModel.php b/marketplace/code/ui/frontend/view_models/CompanyViewModel.php
index dfdb05c..fd87a21 100644
--- a/marketplace/code/ui/frontend/view_models/CompanyViewModel.php
+++ b/marketplace/code/ui/frontend/view_models/CompanyViewModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/view_models/CourseLocationViewModel.php b/marketplace/code/ui/frontend/view_models/CourseLocationViewModel.php
index e48b49d..07b98eb 100644
--- a/marketplace/code/ui/frontend/view_models/CourseLocationViewModel.php
+++ b/marketplace/code/ui/frontend/view_models/CourseLocationViewModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/view_models/CourseViewModel.php b/marketplace/code/ui/frontend/view_models/CourseViewModel.php
index 6009b26..eb6986e 100644
--- a/marketplace/code/ui/frontend/view_models/CourseViewModel.php
+++ b/marketplace/code/ui/frontend/view_models/CourseViewModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/ui/frontend/view_models/TrainingViewModel.php b/marketplace/code/ui/frontend/view_models/TrainingViewModel.php
index ba87e89..640664e 100644
--- a/marketplace/code/ui/frontend/view_models/TrainingViewModel.php
+++ b/marketplace/code/ui/frontend/view_models/TrainingViewModel.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/code/utils/helpers.php b/marketplace/code/utils/helpers.php
index dfeaf97..6f871fc 100644
--- a/marketplace/code/utils/helpers.php
+++ b/marketplace/code/utils/helpers.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/tests/OpenStackApiTest.php b/marketplace/tests/OpenStackApiTest.php
index 57bdb3d..0da7a56 100644
--- a/marketplace/tests/OpenStackApiTest.php
+++ b/marketplace/tests/OpenStackApiTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/marketplace/tests/TrainingServiceTest.php b/marketplace/tests/TrainingServiceTest.php
index 118d690..18f88af 100644
--- a/marketplace/tests/TrainingServiceTest.php
+++ b/marketplace/tests/TrainingServiceTest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/_config.php b/news/_config.php
index 9416a0b..f6b3469 100644
--- a/news/_config.php
+++ b/news/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/active_records/News.php b/news/code/infrastructure/active_records/News.php
index 96ee9ae..6b58f9f 100644
--- a/news/code/infrastructure/active_records/News.php
+++ b/news/code/infrastructure/active_records/News.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/active_records/NewsManager.php b/news/code/infrastructure/active_records/NewsManager.php
index e0d9592..6e74ad3 100644
--- a/news/code/infrastructure/active_records/NewsManager.php
+++ b/news/code/infrastructure/active_records/NewsManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/active_records/Submitter.php b/news/code/infrastructure/active_records/Submitter.php
index cdc03d5..034ba03 100644
--- a/news/code/infrastructure/active_records/Submitter.php
+++ b/news/code/infrastructure/active_records/Submitter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/active_records/Tag.php b/news/code/infrastructure/active_records/Tag.php
index 11384f2..500a13a 100644
--- a/news/code/infrastructure/active_records/Tag.php
+++ b/news/code/infrastructure/active_records/Tag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/factories/NewsFactory.php b/news/code/infrastructure/factories/NewsFactory.php
index 55020ba..101bcfe 100644
--- a/news/code/infrastructure/factories/NewsFactory.php
+++ b/news/code/infrastructure/factories/NewsFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/factories/NewsValidationFactory.php b/news/code/infrastructure/factories/NewsValidationFactory.php
index a6503b6..3fff8bf 100644
--- a/news/code/infrastructure/factories/NewsValidationFactory.php
+++ b/news/code/infrastructure/factories/NewsValidationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/repositories/SapphireNewsRepository.php b/news/code/infrastructure/repositories/SapphireNewsRepository.php
index 824a13e..185ce96 100644
--- a/news/code/infrastructure/repositories/SapphireNewsRepository.php
+++ b/news/code/infrastructure/repositories/SapphireNewsRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/repositories/SapphireSubmitterRepository.php b/news/code/infrastructure/repositories/SapphireSubmitterRepository.php
index 81ce6bd..fe22743 100644
--- a/news/code/infrastructure/repositories/SapphireSubmitterRepository.php
+++ b/news/code/infrastructure/repositories/SapphireSubmitterRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/infrastructure/tasks/NewsArticlesUpdateTask.php b/news/code/infrastructure/tasks/NewsArticlesUpdateTask.php
index fe951a9..7846072 100644
--- a/news/code/infrastructure/tasks/NewsArticlesUpdateTask.php
+++ b/news/code/infrastructure/tasks/NewsArticlesUpdateTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/migrations/NewsMigrationTask.php b/news/code/migrations/NewsMigrationTask.php
index 88085e8..e895b30 100644
--- a/news/code/migrations/NewsMigrationTask.php
+++ b/news/code/migrations/NewsMigrationTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/INews.php b/news/code/model/INews.php
index a6e43ad..407fa12 100644
--- a/news/code/model/INews.php
+++ b/news/code/model/INews.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/INewsFactory.php b/news/code/model/INewsFactory.php
index b6d99be..d5c9085 100644
--- a/news/code/model/INewsFactory.php
+++ b/news/code/model/INewsFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/INewsManager.php b/news/code/model/INewsManager.php
index 23a88fd..fc4e8fa 100644
--- a/news/code/model/INewsManager.php
+++ b/news/code/model/INewsManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/INewsValidationFactory.php b/news/code/model/INewsValidationFactory.php
index 0858505..acf80f5 100644
--- a/news/code/model/INewsValidationFactory.php
+++ b/news/code/model/INewsValidationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/ISubmitter.php b/news/code/model/ISubmitter.php
index 2b9c73f..479d40f 100644
--- a/news/code/model/ISubmitter.php
+++ b/news/code/model/ISubmitter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/ITag.php b/news/code/model/ITag.php
index 5391645..b818d99 100644
--- a/news/code/model/ITag.php
+++ b/news/code/model/ITag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/NewsMainInfo.php b/news/code/model/NewsMainInfo.php
index 02a8a76..279bf2d 100644
--- a/news/code/model/NewsMainInfo.php
+++ b/news/code/model/NewsMainInfo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/NewsRequestManager.php b/news/code/model/NewsRequestManager.php
index 4f821b5..de22596 100644
--- a/news/code/model/NewsRequestManager.php
+++ b/news/code/model/NewsRequestManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/model/NewsSubmitter.php b/news/code/model/NewsSubmitter.php
index 09a7a82..42bac9b 100644
--- a/news/code/model/NewsSubmitter.php
+++ b/news/code/model/NewsSubmitter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/NewsAdminPage_Controller.php b/news/code/ui/frontend/NewsAdminPage_Controller.php
index d64b344..dc3a950 100644
--- a/news/code/ui/frontend/NewsAdminPage_Controller.php
+++ b/news/code/ui/frontend/NewsAdminPage_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/NewsPage_Controller.php b/news/code/ui/frontend/NewsPage_Controller.php
index 2918149..d37f40a 100644
--- a/news/code/ui/frontend/NewsPage_Controller.php
+++ b/news/code/ui/frontend/NewsPage_Controller.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/NewsRequestForm.php b/news/code/ui/frontend/NewsRequestForm.php
index 9fcbaf9..af3258e 100644
--- a/news/code/ui/frontend/NewsRequestForm.php
+++ b/news/code/ui/frontend/NewsRequestForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/NewsRequestPage.php b/news/code/ui/frontend/NewsRequestPage.php
index 5b5785a..331332a 100644
--- a/news/code/ui/frontend/NewsRequestPage.php
+++ b/news/code/ui/frontend/NewsRequestPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/js/admin/sangria.page.event.extension.js b/news/code/ui/frontend/js/admin/sangria.page.event.extension.js
index 8659232..0c61c7a 100644
--- a/news/code/ui/frontend/js/admin/sangria.page.event.extension.js
+++ b/news/code/ui/frontend/js/admin/sangria.page.event.extension.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/js/news.admin.js b/news/code/ui/frontend/js/news.admin.js
index 2e3a91f..8f43a89 100644
--- a/news/code/ui/frontend/js/news.admin.js
+++ b/news/code/ui/frontend/js/news.admin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/js/news.form.js b/news/code/ui/frontend/js/news.form.js
index e9c58f7..b3150a6 100644
--- a/news/code/ui/frontend/js/news.form.js
+++ b/news/code/ui/frontend/js/news.form.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/js/news.js b/news/code/ui/frontend/js/news.js
index c9dfd49..e2e4811 100644
--- a/news/code/ui/frontend/js/news.js
+++ b/news/code/ui/frontend/js/news.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/news/code/ui/frontend/js/news.request.page.js b/news/code/ui/frontend/js/news.request.page.js
index e7df23a..e9ae3ea 100644
--- a/news/code/ui/frontend/js/news.request.page.js
+++ b/news/code/ui/frontend/js/news.request.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/_config.php b/openstack/_config.php
index 8b1c4fe..24d757b 100644
--- a/openstack/_config.php
+++ b/openstack/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ATCMember.php b/openstack/code/ATCMember.php
index 98891af..5c46fe3 100644
--- a/openstack/code/ATCMember.php
+++ b/openstack/code/ATCMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AddInvolvementTypeForm.php b/openstack/code/AddInvolvementTypeForm.php
index fc49e30..9ebee29 100644
--- a/openstack/code/AddInvolvementTypeForm.php
+++ b/openstack/code/AddInvolvementTypeForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AddSpeakerForm.php b/openstack/code/AddSpeakerForm.php
index 94fe929..ac1aa51 100644
--- a/openstack/code/AddSpeakerForm.php
+++ b/openstack/code/AddSpeakerForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AffiliationUpdate.php b/openstack/code/AffiliationUpdate.php
index a05d082..cc40fa9 100644
--- a/openstack/code/AffiliationUpdate.php
+++ b/openstack/code/AffiliationUpdate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AnniversaryPage.php b/openstack/code/AnniversaryPage.php
index 3bb9cc6..e042dad 100644
--- a/openstack/code/AnniversaryPage.php
+++ b/openstack/code/AnniversaryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ArticleHolder.php b/openstack/code/ArticleHolder.php
index 0c839b0..48aef13 100644
--- a/openstack/code/ArticleHolder.php
+++ b/openstack/code/ArticleHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ArticlePage.php b/openstack/code/ArticlePage.php
index 2547b54..0071137 100644
--- a/openstack/code/ArticlePage.php
+++ b/openstack/code/ArticlePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AttachmentFile.php b/openstack/code/AttachmentFile.php
index 6ed28e2..c8d4a11 100644
--- a/openstack/code/AttachmentFile.php
+++ b/openstack/code/AttachmentFile.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AttachmentImage.php b/openstack/code/AttachmentImage.php
index bc2a614..1e007b6 100644
--- a/openstack/code/AttachmentImage.php
+++ b/openstack/code/AttachmentImage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AutoCompleteOrgDecorator.php b/openstack/code/AutoCompleteOrgDecorator.php
index 8c76d72..c4d8ce0 100644
--- a/openstack/code/AutoCompleteOrgDecorator.php
+++ b/openstack/code/AutoCompleteOrgDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/AutocompleteMemberDecorator.php b/openstack/code/AutocompleteMemberDecorator.php
index f3cd955..8efda52 100755
--- a/openstack/code/AutocompleteMemberDecorator.php
+++ b/openstack/code/AutocompleteMemberDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/BetterImage.php b/openstack/code/BetterImage.php
index b628f84..56f67e8 100644
--- a/openstack/code/BetterImage.php
+++ b/openstack/code/BetterImage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Bio.php b/openstack/code/Bio.php
index 405d474..440714b 100644
--- a/openstack/code/Bio.php
+++ b/openstack/code/Bio.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/BioPage.php b/openstack/code/BioPage.php
index 3f8ccd0..f48b43d 100644
--- a/openstack/code/BioPage.php
+++ b/openstack/code/BioPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/BoardOfDirectorsPage.php b/openstack/code/BoardOfDirectorsPage.php
index 19d4fb0..e413ab5 100644
--- a/openstack/code/BoardOfDirectorsPage.php
+++ b/openstack/code/BoardOfDirectorsPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/BrandingPage.php b/openstack/code/BrandingPage.php
index 9780361..0ec68fe 100644
--- a/openstack/code/BrandingPage.php
+++ b/openstack/code/BrandingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Candidate.php b/openstack/code/Candidate.php
index 091bf37..83e095b 100644
--- a/openstack/code/Candidate.php
+++ b/openstack/code/Candidate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CandidateApplicationForm.php b/openstack/code/CandidateApplicationForm.php
index 381c48c..c6ca4c3 100644
--- a/openstack/code/CandidateApplicationForm.php
+++ b/openstack/code/CandidateApplicationForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CandidateNomination.php b/openstack/code/CandidateNomination.php
index 7756608..4cfcd89 100644
--- a/openstack/code/CandidateNomination.php
+++ b/openstack/code/CandidateNomination.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CandidatePage.php b/openstack/code/CandidatePage.php
index dff3029..4530e50 100644
--- a/openstack/code/CandidatePage.php
+++ b/openstack/code/CandidatePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CommMember.php b/openstack/code/CommMember.php
index 16596b5..d6ce077 100644
--- a/openstack/code/CommMember.php
+++ b/openstack/code/CommMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CommPage.php b/openstack/code/CommPage.php
index 4fe0c4c..a59408c 100644
--- a/openstack/code/CommPage.php
+++ b/openstack/code/CommPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CommunityPage.php b/openstack/code/CommunityPage.php
index e82f99c..6307e2b 100644
--- a/openstack/code/CommunityPage.php
+++ b/openstack/code/CommunityPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CompaniesPage.php b/openstack/code/CompaniesPage.php
index 602ac1e..6ac92ad 100644
--- a/openstack/code/CompaniesPage.php
+++ b/openstack/code/CompaniesPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Company.php b/openstack/code/Company.php
index e7c0279..1f1a918 100644
--- a/openstack/code/Company.php
+++ b/openstack/code/Company.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CompanyAdmin.php b/openstack/code/CompanyAdmin.php
index 7ddc29c..f88ee78 100644
--- a/openstack/code/CompanyAdmin.php
+++ b/openstack/code/CompanyAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CompanyEditForm.php b/openstack/code/CompanyEditForm.php
index b584918..c6c3c80 100644
--- a/openstack/code/CompanyEditForm.php
+++ b/openstack/code/CompanyEditForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CompanyListPage.php b/openstack/code/CompanyListPage.php
index 3be3de6..9f8eebd 100644
--- a/openstack/code/CompanyListPage.php
+++ b/openstack/code/CompanyListPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ConferenceLivePage.php b/openstack/code/ConferenceLivePage.php
index 28bc213..52e1c05 100644
--- a/openstack/code/ConferenceLivePage.php
+++ b/openstack/code/ConferenceLivePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ConferenceNewsPage.php b/openstack/code/ConferenceNewsPage.php
index 4b4efd0..0124ec3 100644
--- a/openstack/code/ConferenceNewsPage.php
+++ b/openstack/code/ConferenceNewsPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ConferencePage.php b/openstack/code/ConferencePage.php
index cf73274..0a30c3c 100644
--- a/openstack/code/ConferencePage.php
+++ b/openstack/code/ConferencePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ConferenceSubPage.php b/openstack/code/ConferenceSubPage.php
index 1e99a9c..9c7ef76 100644
--- a/openstack/code/ConferenceSubPage.php
+++ b/openstack/code/ConferenceSubPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Contract.php b/openstack/code/Contract.php
index 484b212..a503374 100644
--- a/openstack/code/Contract.php
+++ b/openstack/code/Contract.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ContractTemplate.php b/openstack/code/ContractTemplate.php
index d09e812..4c72289 100644
--- a/openstack/code/ContractTemplate.php
+++ b/openstack/code/ContractTemplate.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/CustomSiteConfig.php b/openstack/code/CustomSiteConfig.php
index 49a2dae..3157ec4 100644
--- a/openstack/code/CustomSiteConfig.php
+++ b/openstack/code/CustomSiteConfig.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/DirectAfterLoginPage.php b/openstack/code/DirectAfterLoginPage.php
index 134ae4c..6e10a10 100644
--- a/openstack/code/DirectAfterLoginPage.php
+++ b/openstack/code/DirectAfterLoginPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ElectionPage.php b/openstack/code/ElectionPage.php
index 35a6407..a6c37c7 100644
--- a/openstack/code/ElectionPage.php
+++ b/openstack/code/ElectionPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ElectionSystem.php b/openstack/code/ElectionSystem.php
index 78011ba..f857644 100644
--- a/openstack/code/ElectionSystem.php
+++ b/openstack/code/ElectionSystem.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ElectionVoterPage.php b/openstack/code/ElectionVoterPage.php
index d9f9c4e..56133d9 100644
--- a/openstack/code/ElectionVoterPage.php
+++ b/openstack/code/ElectionVoterPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Feature.php b/openstack/code/Feature.php
index 7b0c894..cd2bd80 100644
--- a/openstack/code/Feature.php
+++ b/openstack/code/Feature.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/FeedbackForm.php b/openstack/code/FeedbackForm.php
index 45f3d2b..4c283d7 100644
--- a/openstack/code/FeedbackForm.php
+++ b/openstack/code/FeedbackForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/FeedbackSubmission.php b/openstack/code/FeedbackSubmission.php
index 8c5bab0..0a5b5f2 100644
--- a/openstack/code/FeedbackSubmission.php
+++ b/openstack/code/FeedbackSubmission.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/GroupDecorator.php b/openstack/code/GroupDecorator.php
index 78bb465..65a6371 100644
--- a/openstack/code/GroupDecorator.php
+++ b/openstack/code/GroupDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/HomePage.php b/openstack/code/HomePage.php
index d5254fd..139cf02 100644
--- a/openstack/code/HomePage.php
+++ b/openstack/code/HomePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/IVotedPage.php b/openstack/code/IVotedPage.php
index 20f6201..ea5e0f1 100644
--- a/openstack/code/IVotedPage.php
+++ b/openstack/code/IVotedPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/InvolvementType.php b/openstack/code/InvolvementType.php
index b10827b..34f398e 100644
--- a/openstack/code/InvolvementType.php
+++ b/openstack/code/InvolvementType.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/JSONMember.php b/openstack/code/JSONMember.php
index 99b6ac6..ba10097 100644
--- a/openstack/code/JSONMember.php
+++ b/openstack/code/JSONMember.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LandingPage.php b/openstack/code/LandingPage.php
index eada083..e4b81f1 100644
--- a/openstack/code/LandingPage.php
+++ b/openstack/code/LandingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LandingPageCn.php b/openstack/code/LandingPageCn.php
index b2be761..3909dbf 100644
--- a/openstack/code/LandingPageCn.php
+++ b/openstack/code/LandingPageCn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LegalAgreement.php b/openstack/code/LegalAgreement.php
index 83ff0c4..46cc174 100644
--- a/openstack/code/LegalAgreement.php
+++ b/openstack/code/LegalAgreement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LegalDocumentPage.php b/openstack/code/LegalDocumentPage.php
index 63f821e..5af26a2 100644
--- a/openstack/code/LegalDocumentPage.php
+++ b/openstack/code/LegalDocumentPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LegalDocumentsHolder.php b/openstack/code/LegalDocumentsHolder.php
index 53b45c3..607aa3b 100644
--- a/openstack/code/LegalDocumentsHolder.php
+++ b/openstack/code/LegalDocumentsHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Link.php b/openstack/code/Link.php
index ee80d92..480dff3 100644
--- a/openstack/code/Link.php
+++ b/openstack/code/Link.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LogoDownloadPage.php b/openstack/code/LogoDownloadPage.php
index b207e98..8e99492 100644
--- a/openstack/code/LogoDownloadPage.php
+++ b/openstack/code/LogoDownloadPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LogoGuidelinesPage.php b/openstack/code/LogoGuidelinesPage.php
index c2e5e15..74867f5 100644
--- a/openstack/code/LogoGuidelinesPage.php
+++ b/openstack/code/LogoGuidelinesPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LogoRightsPage.php b/openstack/code/LogoRightsPage.php
index 10132ae..499bd97 100644
--- a/openstack/code/LogoRightsPage.php
+++ b/openstack/code/LogoRightsPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/LogoRightsSubmission.php b/openstack/code/LogoRightsSubmission.php
index 79fac0d..5087661 100644
--- a/openstack/code/LogoRightsSubmission.php
+++ b/openstack/code/LogoRightsSubmission.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/MemberListPage.php b/openstack/code/MemberListPage.php
index 3f81319..4b04031 100644
--- a/openstack/code/MemberListPage.php
+++ b/openstack/code/MemberListPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/MemberVerifyPage.php b/openstack/code/MemberVerifyPage.php
index eff17bd..65ddad9 100644
--- a/openstack/code/MemberVerifyPage.php
+++ b/openstack/code/MemberVerifyPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/NewCompanyListPage.php b/openstack/code/NewCompanyListPage.php
index bc2829f..f0fc57e 100644
--- a/openstack/code/NewCompanyListPage.php
+++ b/openstack/code/NewCompanyListPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OSLogoProgramForm.php b/openstack/code/OSLogoProgramForm.php
index 5d2aaac..0310552 100644
--- a/openstack/code/OSLogoProgramForm.php
+++ b/openstack/code/OSLogoProgramForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OSLogoProgramPage.php b/openstack/code/OSLogoProgramPage.php
index 69c0cd9..0e55738 100644
--- a/openstack/code/OSLogoProgramPage.php
+++ b/openstack/code/OSLogoProgramPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OSLogoProgramResponse.php b/openstack/code/OSLogoProgramResponse.php
index 705a7a7..b8dedae 100644
--- a/openstack/code/OSLogoProgramResponse.php
+++ b/openstack/code/OSLogoProgramResponse.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OneColumn.php b/openstack/code/OneColumn.php
index c695107..341a6bc 100644
--- a/openstack/code/OneColumn.php
+++ b/openstack/code/OneColumn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OpenStackFoundationStaffPage.php b/openstack/code/OpenStackFoundationStaffPage.php
index b954f97..a29f3ea 100644
--- a/openstack/code/OpenStackFoundationStaffPage.php
+++ b/openstack/code/OpenStackFoundationStaffPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OpenStackUserRequest.php b/openstack/code/OpenStackUserRequest.php
index e17d542..41addd0 100644
--- a/openstack/code/OpenStackUserRequest.php
+++ b/openstack/code/OpenStackUserRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/OpenstackUser.php b/openstack/code/OpenstackUser.php
index 0127bf9..ea35ae7 100644
--- a/openstack/code/OpenstackUser.php
+++ b/openstack/code/OpenstackUser.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Org.php b/openstack/code/Org.php
index 98510b8..18203b2 100644
--- a/openstack/code/Org.php
+++ b/openstack/code/Org.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Page.php b/openstack/code/Page.php
index 82ad46a..af9dc6d 100644
--- a/openstack/code/Page.php
+++ b/openstack/code/Page.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/PdfPage.php b/openstack/code/PdfPage.php
index c83c596..7c79e67 100644
--- a/openstack/code/PdfPage.php
+++ b/openstack/code/PdfPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Presentation.php b/openstack/code/Presentation.php
index 2d1836b..02563c8 100644
--- a/openstack/code/Presentation.php
+++ b/openstack/code/Presentation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/PresentationCategoryPage.php b/openstack/code/PresentationCategoryPage.php
index 2ae1103..5541d61 100644
--- a/openstack/code/PresentationCategoryPage.php
+++ b/openstack/code/PresentationCategoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/PrimaryLogoPage.php b/openstack/code/PrimaryLogoPage.php
index bd64d5a..c3cbb90 100644
--- a/openstack/code/PrimaryLogoPage.php
+++ b/openstack/code/PrimaryLogoPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ProductPage.php b/openstack/code/ProductPage.php
index ff1c3f2..49f29a7 100644
--- a/openstack/code/ProductPage.php
+++ b/openstack/code/ProductPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Project.php b/openstack/code/Project.php
index 4c373e3..fae04de 100644
--- a/openstack/code/Project.php
+++ b/openstack/code/Project.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/ProjectAdmin.php b/openstack/code/ProjectAdmin.php
index ec876bc..0bc492a 100644
--- a/openstack/code/ProjectAdmin.php
+++ b/openstack/code/ProjectAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/RestrictedDownloadPage.php b/openstack/code/RestrictedDownloadPage.php
index 5e88949..faeccb9 100644
--- a/openstack/code/RestrictedDownloadPage.php
+++ b/openstack/code/RestrictedDownloadPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/SangriaPage.php b/openstack/code/SangriaPage.php
index ca6a1f6..43f810f 100644
--- a/openstack/code/SangriaPage.php
+++ b/openstack/code/SangriaPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/SiteBannerConfigurationSetting.php b/openstack/code/SiteBannerConfigurationSetting.php
index 5c43194..704605f 100644
--- a/openstack/code/SiteBannerConfigurationSetting.php
+++ b/openstack/code/SiteBannerConfigurationSetting.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/SponsorsPage.php b/openstack/code/SponsorsPage.php
index d34a9f2..3f42fb1 100644
--- a/openstack/code/SponsorsPage.php
+++ b/openstack/code/SponsorsPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/StartPage.php b/openstack/code/StartPage.php
index 043d095..ae7cfb4 100644
--- a/openstack/code/StartPage.php
+++ b/openstack/code/StartPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/StartPageHolder.php b/openstack/code/StartPageHolder.php
index 82c11cf..0ba0a91 100644
--- a/openstack/code/StartPageHolder.php
+++ b/openstack/code/StartPageHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/TechnicalCommitteePage.php b/openstack/code/TechnicalCommitteePage.php
index 794d53c..6989ca0 100644
--- a/openstack/code/TechnicalCommitteePage.php
+++ b/openstack/code/TechnicalCommitteePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Topic.php b/openstack/code/Topic.php
index 2a413b5..03e8d7e 100644
--- a/openstack/code/Topic.php
+++ b/openstack/code/Topic.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/UserStoriesHolder.php b/openstack/code/UserStoriesHolder.php
index e3fef3f..b7ef074 100644
--- a/openstack/code/UserStoriesHolder.php
+++ b/openstack/code/UserStoriesHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/UserStoryPage.php b/openstack/code/UserStoryPage.php
index db97adc..84cf2ff 100644
--- a/openstack/code/UserStoryPage.php
+++ b/openstack/code/UserStoryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/Voter.php b/openstack/code/Voter.php
index 51edab5..70ba6b9 100644
--- a/openstack/code/Voter.php
+++ b/openstack/code/Voter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/WebBadgeDownloadPage.php b/openstack/code/WebBadgeDownloadPage.php
index ae4efa3..403878e 100644
--- a/openstack/code/WebBadgeDownloadPage.php
+++ b/openstack/code/WebBadgeDownloadPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/AppDevSurvey.php b/openstack/code/deployment-survey/AppDevSurvey.php
index 874ab9f..ae24f2f 100644
--- a/openstack/code/deployment-survey/AppDevSurvey.php
+++ b/openstack/code/deployment-survey/AppDevSurvey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/CancelFormAction.php b/openstack/code/deployment-survey/CancelFormAction.php
index 3c201f5..27d80a2 100644
--- a/openstack/code/deployment-survey/CancelFormAction.php
+++ b/openstack/code/deployment-survey/CancelFormAction.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/ColumnFormatter.php b/openstack/code/deployment-survey/ColumnFormatter.php
index 9be6d50..fdc17e3 100644
--- a/openstack/code/deployment-survey/ColumnFormatter.php
+++ b/openstack/code/deployment-survey/ColumnFormatter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/CountryCodes.php b/openstack/code/deployment-survey/CountryCodes.php
index bfd98e2..a0034e7 100644
--- a/openstack/code/deployment-survey/CountryCodes.php
+++ b/openstack/code/deployment-survey/CountryCodes.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/Deployment.php b/openstack/code/deployment-survey/Deployment.php
index 3efea0d..ee5bd28 100644
--- a/openstack/code/deployment-survey/Deployment.php
+++ b/openstack/code/deployment-survey/Deployment.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentAdmin.php b/openstack/code/deployment-survey/DeploymentAdmin.php
index f5077e8..8a8d3bb 100644
--- a/openstack/code/deployment-survey/DeploymentAdmin.php
+++ b/openstack/code/deployment-survey/DeploymentAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentReport.php b/openstack/code/deployment-survey/DeploymentReport.php
index 4881b30..968cc93 100644
--- a/openstack/code/deployment-survey/DeploymentReport.php
+++ b/openstack/code/deployment-survey/DeploymentReport.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurvey.php b/openstack/code/deployment-survey/DeploymentSurvey.php
index d0a55bc..4a51b9a 100644
--- a/openstack/code/deployment-survey/DeploymentSurvey.php
+++ b/openstack/code/deployment-survey/DeploymentSurvey.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyAppDevSurveyForm.php b/openstack/code/deployment-survey/DeploymentSurveyAppDevSurveyForm.php
index 5bf9b8e..5b7ed7a 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyAppDevSurveyForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyAppDevSurveyForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyDeploymentDetailsForm.php b/openstack/code/deployment-survey/DeploymentSurveyDeploymentDetailsForm.php
index 4a1e4a8..d9caf3c 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyDeploymentDetailsForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyDeploymentDetailsForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyDeploymentsForm.php b/openstack/code/deployment-survey/DeploymentSurveyDeploymentsForm.php
index ff3cd34..103a5d5 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyDeploymentsForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyDeploymentsForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyMoreDeploymentDetailsForm.php b/openstack/code/deployment-survey/DeploymentSurveyMoreDeploymentDetailsForm.php
index 2894982..aa94d12 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyMoreDeploymentDetailsForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyMoreDeploymentDetailsForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyOrgInfoForm.php b/openstack/code/deployment-survey/DeploymentSurveyOrgInfoForm.php
index 8a6758b..edae6f9 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyOrgInfoForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyOrgInfoForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyPage.php b/openstack/code/deployment-survey/DeploymentSurveyPage.php
index cae9e19..dbd0399 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyPage.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveyRegistrationForm.php b/openstack/code/deployment-survey/DeploymentSurveyRegistrationForm.php
index d0cf872..b4ca0ce 100644
--- a/openstack/code/deployment-survey/DeploymentSurveyRegistrationForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveyRegistrationForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/DeploymentSurveySavePasswordForm.php b/openstack/code/deployment-survey/DeploymentSurveySavePasswordForm.php
index 235cc8d..1ba03f1 100644
--- a/openstack/code/deployment-survey/DeploymentSurveySavePasswordForm.php
+++ b/openstack/code/deployment-survey/DeploymentSurveySavePasswordForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/EmailValidator.php b/openstack/code/deployment-survey/EmailValidator.php
index dd96a12..6d54aad 100644
--- a/openstack/code/deployment-survey/EmailValidator.php
+++ b/openstack/code/deployment-survey/EmailValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/deployment-survey/tasks/DeploymentSurveyTask.php b/openstack/code/deployment-survey/tasks/DeploymentSurveyTask.php
index 6a05bbc..84be377 100644
--- a/openstack/code/deployment-survey/tasks/DeploymentSurveyTask.php
+++ b/openstack/code/deployment-survey/tasks/DeploymentSurveyTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/event-signin/EventSignIn.php b/openstack/code/event-signin/EventSignIn.php
index fb03dba..2619b48 100644
--- a/openstack/code/event-signin/EventSignIn.php
+++ b/openstack/code/event-signin/EventSignIn.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/event-signin/SigninForm.php b/openstack/code/event-signin/SigninForm.php
index 1c883d8..81acb28 100644
--- a/openstack/code/event-signin/SigninForm.php
+++ b/openstack/code/event-signin/SigninForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/event-signin/SigninPage.php b/openstack/code/event-signin/SigninPage.php
index ea28f71..950ea93 100644
--- a/openstack/code/event-signin/SigninPage.php
+++ b/openstack/code/event-signin/SigninPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/CompanyCountQuery.php b/openstack/code/infrastructure/queries/CompanyCountQuery.php
index bb9d297..07a306c 100644
--- a/openstack/code/infrastructure/queries/CompanyCountQuery.php
+++ b/openstack/code/infrastructure/queries/CompanyCountQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/CompanyCountQuerySpecification.php b/openstack/code/infrastructure/queries/CompanyCountQuerySpecification.php
index 79f211e..a3c161c 100644
--- a/openstack/code/infrastructure/queries/CompanyCountQuerySpecification.php
+++ b/openstack/code/infrastructure/queries/CompanyCountQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuery.php b/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuery.php
index 89bbba5..828b3fc 100644
--- a/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuery.php
+++ b/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuerySpecification.php b/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuerySpecification.php
index ca9df79..42c3012 100644
--- a/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuerySpecification.php
+++ b/openstack/code/infrastructure/queries/FoundationMembersSubscribedToNewsLetterCountQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/IndividualCommunityMemberCountQuery.php b/openstack/code/infrastructure/queries/IndividualCommunityMemberCountQuery.php
index 95699c6..258c36f 100644
--- a/openstack/code/infrastructure/queries/IndividualCommunityMemberCountQuery.php
+++ b/openstack/code/infrastructure/queries/IndividualCommunityMemberCountQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/IndividualFoundationMemberCountQuery.php b/openstack/code/infrastructure/queries/IndividualFoundationMemberCountQuery.php
index f5c7df5..a30170e 100644
--- a/openstack/code/infrastructure/queries/IndividualFoundationMemberCountQuery.php
+++ b/openstack/code/infrastructure/queries/IndividualFoundationMemberCountQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/UserStoriesCountQuery.php b/openstack/code/infrastructure/queries/UserStoriesCountQuery.php
index ecc8adb..83634ac 100644
--- a/openstack/code/infrastructure/queries/UserStoriesCountQuery.php
+++ b/openstack/code/infrastructure/queries/UserStoriesCountQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/infrastructure/queries/UserStoriesCountQuerySpecification.php b/openstack/code/infrastructure/queries/UserStoriesCountQuerySpecification.php
index 07a69c7..37c4b40 100644
--- a/openstack/code/infrastructure/queries/UserStoriesCountQuerySpecification.php
+++ b/openstack/code/infrastructure/queries/UserStoriesCountQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/landing-pages/AutomotiveLandingPage.php b/openstack/code/landing-pages/AutomotiveLandingPage.php
index 4f9828f..263845a 100644
--- a/openstack/code/landing-pages/AutomotiveLandingPage.php
+++ b/openstack/code/landing-pages/AutomotiveLandingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/Announcement.php b/openstack/code/marketing/Announcement.php
index 4c6c4af..0aceccf 100644
--- a/openstack/code/marketing/Announcement.php
+++ b/openstack/code/marketing/Announcement.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/CaseStudy.php b/openstack/code/marketing/CaseStudy.php
index 0972c66..2045b0d 100755
--- a/openstack/code/marketing/CaseStudy.php
+++ b/openstack/code/marketing/CaseStudy.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/CollateralPresentation.php b/openstack/code/marketing/CollateralPresentation.php
index b99d2b5..fe479f4 100755
--- a/openstack/code/marketing/CollateralPresentation.php
+++ b/openstack/code/marketing/CollateralPresentation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/EventMaterial.php b/openstack/code/marketing/EventMaterial.php
index 6b0f6a3..4e1fce8 100755
--- a/openstack/code/marketing/EventMaterial.php
+++ b/openstack/code/marketing/EventMaterial.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/Graphic.php b/openstack/code/marketing/Graphic.php
index 1d92d40..1061a0a 100755
--- a/openstack/code/marketing/Graphic.php
+++ b/openstack/code/marketing/Graphic.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/GraphicFIle.php b/openstack/code/marketing/GraphicFIle.php
index e8a10f4..dff1afa 100755
--- a/openstack/code/marketing/GraphicFIle.php
+++ b/openstack/code/marketing/GraphicFIle.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/MarketingPage.php b/openstack/code/marketing/MarketingPage.php
index 0bbb84c..c65d712 100755
--- a/openstack/code/marketing/MarketingPage.php
+++ b/openstack/code/marketing/MarketingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/SectionLink.php b/openstack/code/marketing/SectionLink.php
index 289cbdf..58a5c96 100755
--- a/openstack/code/marketing/SectionLink.php
+++ b/openstack/code/marketing/SectionLink.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/marketing/YouTubeVideo.php b/openstack/code/marketing/YouTubeVideo.php
index e3e2ad3..f0c7b51 100644
--- a/openstack/code/marketing/YouTubeVideo.php
+++ b/openstack/code/marketing/YouTubeVideo.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/AffiliationsMigrationTask.php b/openstack/code/migrations/AffiliationsMigrationTask.php
index e36d30c..d16e1ea 100644
--- a/openstack/code/migrations/AffiliationsMigrationTask.php
+++ b/openstack/code/migrations/AffiliationsMigrationTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/DeploymentSurveyMigration.php b/openstack/code/migrations/DeploymentSurveyMigration.php
index 7e95e83..1b11c67 100644
--- a/openstack/code/migrations/DeploymentSurveyMigration.php
+++ b/openstack/code/migrations/DeploymentSurveyMigration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/Migration.php b/openstack/code/migrations/Migration.php
index 1cf11ed..cbec2da 100644
--- a/openstack/code/migrations/Migration.php
+++ b/openstack/code/migrations/Migration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/UpdateAnniversaryPage.php b/openstack/code/migrations/UpdateAnniversaryPage.php
index ccc9171..64d6c20 100644
--- a/openstack/code/migrations/UpdateAnniversaryPage.php
+++ b/openstack/code/migrations/UpdateAnniversaryPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/UpdateDeploymentSurveyDigest.php b/openstack/code/migrations/UpdateDeploymentSurveyDigest.php
index 4efc617..6524b59 100644
--- a/openstack/code/migrations/UpdateDeploymentSurveyDigest.php
+++ b/openstack/code/migrations/UpdateDeploymentSurveyDigest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/migrations/UpdateDeploymentsOrgTask.php b/openstack/code/migrations/UpdateDeploymentsOrgTask.php
index 473f327..71bdf47 100644
--- a/openstack/code/migrations/UpdateDeploymentsOrgTask.php
+++ b/openstack/code/migrations/UpdateDeploymentsOrgTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/CallForSpeakersForm.php b/openstack/code/summit/CallForSpeakersForm.php
index 319a13f..3dd7dec 100644
--- a/openstack/code/summit/CallForSpeakersForm.php
+++ b/openstack/code/summit/CallForSpeakersForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/CallForSpeakersPage.php b/openstack/code/summit/CallForSpeakersPage.php
index dda3289..f469a31 100644
--- a/openstack/code/summit/CallForSpeakersPage.php
+++ b/openstack/code/summit/CallForSpeakersPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/CallForSpeakersRegistrationForm.php b/openstack/code/summit/CallForSpeakersRegistrationForm.php
index f6f87dc..d31c715 100644
--- a/openstack/code/summit/CallForSpeakersRegistrationForm.php
+++ b/openstack/code/summit/CallForSpeakersRegistrationForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/OnsitePhoneForm.php b/openstack/code/summit/OnsitePhoneForm.php
index fc6cfb9..3053745 100644
--- a/openstack/code/summit/OnsitePhoneForm.php
+++ b/openstack/code/summit/OnsitePhoneForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationEditorPage.php b/openstack/code/summit/PresentationEditorPage.php
index 9abac5e..1989007 100644
--- a/openstack/code/summit/PresentationEditorPage.php
+++ b/openstack/code/summit/PresentationEditorPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationFlagForm.php b/openstack/code/summit/PresentationFlagForm.php
index 7d27a53..bcf61a7 100644
--- a/openstack/code/summit/PresentationFlagForm.php
+++ b/openstack/code/summit/PresentationFlagForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationLinkToForm.php b/openstack/code/summit/PresentationLinkToForm.php
index d2c7082..9e9a986 100644
--- a/openstack/code/summit/PresentationLinkToForm.php
+++ b/openstack/code/summit/PresentationLinkToForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationMediaUploadForm.php b/openstack/code/summit/PresentationMediaUploadForm.php
index c9f9235..f5f57c0 100644
--- a/openstack/code/summit/PresentationMediaUploadForm.php
+++ b/openstack/code/summit/PresentationMediaUploadForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationSearchForm.php b/openstack/code/summit/PresentationSearchForm.php
index eaec0c5..5f86a4c 100644
--- a/openstack/code/summit/PresentationSearchForm.php
+++ b/openstack/code/summit/PresentationSearchForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationSubcategoryForm.php b/openstack/code/summit/PresentationSubcategoryForm.php
index 73a84ff..0cd6ce9 100644
--- a/openstack/code/summit/PresentationSubcategoryForm.php
+++ b/openstack/code/summit/PresentationSubcategoryForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationVotingPage.php b/openstack/code/summit/PresentationVotingPage.php
index 7b1e920..70053ea 100644
--- a/openstack/code/summit/PresentationVotingPage.php
+++ b/openstack/code/summit/PresentationVotingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/PresentationVotingSearchForm.php b/openstack/code/summit/PresentationVotingSearchForm.php
index 854e63a..825d2ee 100644
--- a/openstack/code/summit/PresentationVotingSearchForm.php
+++ b/openstack/code/summit/PresentationVotingSearchForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SchedEvent.php b/openstack/code/summit/SchedEvent.php
index 075de13..65f1895 100644
--- a/openstack/code/summit/SchedEvent.php
+++ b/openstack/code/summit/SchedEvent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SchedEventMetadata.php b/openstack/code/summit/SchedEventMetadata.php
index 0b2fd41..0093189 100644
--- a/openstack/code/summit/SchedEventMetadata.php
+++ b/openstack/code/summit/SchedEventMetadata.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SchedSpeaker.php b/openstack/code/summit/SchedSpeaker.php
index 090ddcc..e6728b1 100644
--- a/openstack/code/summit/SchedSpeaker.php
+++ b/openstack/code/summit/SchedSpeaker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SchedSpeakerEmailLog.php b/openstack/code/summit/SchedSpeakerEmailLog.php
index f2d7166..af3da6d 100644
--- a/openstack/code/summit/SchedSpeakerEmailLog.php
+++ b/openstack/code/summit/SchedSpeakerEmailLog.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SchedToolsPage.php b/openstack/code/summit/SchedToolsPage.php
index 4c36163..e327f0d 100644
--- a/openstack/code/summit/SchedToolsPage.php
+++ b/openstack/code/summit/SchedToolsPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/Speaker.php b/openstack/code/summit/Speaker.php
index 070e1be..ef4b427 100644
--- a/openstack/code/summit/Speaker.php
+++ b/openstack/code/summit/Speaker.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerBureauForm.php b/openstack/code/summit/SpeakerBureauForm.php
index 28a1aa0..6029f19 100644
--- a/openstack/code/summit/SpeakerBureauForm.php
+++ b/openstack/code/summit/SpeakerBureauForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerDetailsForm.php b/openstack/code/summit/SpeakerDetailsForm.php
index 6e26204..a46fad8 100644
--- a/openstack/code/summit/SpeakerDetailsForm.php
+++ b/openstack/code/summit/SpeakerDetailsForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerListPage.php b/openstack/code/summit/SpeakerListPage.php
index 956f4d3..cb6ffc0 100644
--- a/openstack/code/summit/SpeakerListPage.php
+++ b/openstack/code/summit/SpeakerListPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerManagerPage.php b/openstack/code/summit/SpeakerManagerPage.php
index d8adae7..d5a83e1 100644
--- a/openstack/code/summit/SpeakerManagerPage.php
+++ b/openstack/code/summit/SpeakerManagerPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerSubmission.php b/openstack/code/summit/SpeakerSubmission.php
index bc419cd..fb30132 100644
--- a/openstack/code/summit/SpeakerSubmission.php
+++ b/openstack/code/summit/SpeakerSubmission.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerVote.php b/openstack/code/summit/SpeakerVote.php
index 98bdcab..587002d 100644
--- a/openstack/code/summit/SpeakerVote.php
+++ b/openstack/code/summit/SpeakerVote.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerVoteTotals.php b/openstack/code/summit/SpeakerVoteTotals.php
index 4b3a94e..ab0e4b8 100644
--- a/openstack/code/summit/SpeakerVoteTotals.php
+++ b/openstack/code/summit/SpeakerVoteTotals.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerVotingLoginForm.php b/openstack/code/summit/SpeakerVotingLoginForm.php
index 1ff609e..5905865 100644
--- a/openstack/code/summit/SpeakerVotingLoginForm.php
+++ b/openstack/code/summit/SpeakerVotingLoginForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SpeakerVotingPage.php b/openstack/code/summit/SpeakerVotingPage.php
index 3808a05..9a97815 100644
--- a/openstack/code/summit/SpeakerVotingPage.php
+++ b/openstack/code/summit/SpeakerVotingPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/Summit.php b/openstack/code/summit/Summit.php
index 2542c7c..6380d83 100644
--- a/openstack/code/summit/Summit.php
+++ b/openstack/code/summit/Summit.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitAdmin.php b/openstack/code/summit/SummitAdmin.php
index ecfe0eb..b30f41f 100644
--- a/openstack/code/summit/SummitAdmin.php
+++ b/openstack/code/summit/SummitAdmin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitCategory.php b/openstack/code/summit/SummitCategory.php
index 2d8ea9d..1d426a7 100644
--- a/openstack/code/summit/SummitCategory.php
+++ b/openstack/code/summit/SummitCategory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitCategoryChange.php b/openstack/code/summit/SummitCategoryChange.php
index a5fb5ae..7830387 100644
--- a/openstack/code/summit/SummitCategoryChange.php
+++ b/openstack/code/summit/SummitCategoryChange.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitRegCode.php b/openstack/code/summit/SummitRegCode.php
index 836b482..2d537fa 100644
--- a/openstack/code/summit/SummitRegCode.php
+++ b/openstack/code/summit/SummitRegCode.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitRoom.php b/openstack/code/summit/SummitRoom.php
index 1bec206..590df38 100644
--- a/openstack/code/summit/SummitRoom.php
+++ b/openstack/code/summit/SummitRoom.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitSelectedTalk.php b/openstack/code/summit/SummitSelectedTalk.php
index 811b70e..895e7fd 100644
--- a/openstack/code/summit/SummitSelectedTalk.php
+++ b/openstack/code/summit/SummitSelectedTalk.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitSelectedTalkList.php b/openstack/code/summit/SummitSelectedTalkList.php
index e9cf288..b5273b7 100644
--- a/openstack/code/summit/SummitSelectedTalkList.php
+++ b/openstack/code/summit/SummitSelectedTalkList.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitTalkTag.php b/openstack/code/summit/SummitTalkTag.php
index c1d9025..72377d9 100644
--- a/openstack/code/summit/SummitTalkTag.php
+++ b/openstack/code/summit/SummitTalkTag.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitTimeSlot.php b/openstack/code/summit/SummitTimeSlot.php
index 6c47e7a..8b8c5b5 100644
--- a/openstack/code/summit/SummitTimeSlot.php
+++ b/openstack/code/summit/SummitTimeSlot.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitTopic.php b/openstack/code/summit/SummitTopic.php
index 4d0f786..88f856e 100644
--- a/openstack/code/summit/SummitTopic.php
+++ b/openstack/code/summit/SummitTopic.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitTrack.php b/openstack/code/summit/SummitTrack.php
index e7c0c1b..81edfb5 100644
--- a/openstack/code/summit/SummitTrack.php
+++ b/openstack/code/summit/SummitTrack.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/SummitTrackChair.php b/openstack/code/summit/SummitTrackChair.php
index c903887..3ae36ff 100644
--- a/openstack/code/summit/SummitTrackChair.php
+++ b/openstack/code/summit/SummitTrackChair.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/Talk.php b/openstack/code/summit/Talk.php
index c2e6274..9c39af3 100644
--- a/openstack/code/summit/Talk.php
+++ b/openstack/code/summit/Talk.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/TalkVote.php b/openstack/code/summit/TalkVote.php
index d0eb721..bee9c35 100644
--- a/openstack/code/summit/TalkVote.php
+++ b/openstack/code/summit/TalkVote.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/summit/TrackChairPage.php b/openstack/code/summit/TrackChairPage.php
index 1fe0d0a..e74d059 100644
--- a/openstack/code/summit/TrackChairPage.php
+++ b/openstack/code/summit/TrackChairPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/tasks/UpdateFeedTask.php b/openstack/code/tasks/UpdateFeedTask.php
index 64588a7..31ad137 100644
--- a/openstack/code/tasks/UpdateFeedTask.php
+++ b/openstack/code/tasks/UpdateFeedTask.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesFeatured.php b/openstack/code/user-stories/UserStoriesFeatured.php
index 974dcef..5694c54 100644
--- a/openstack/code/user-stories/UserStoriesFeatured.php
+++ b/openstack/code/user-stories/UserStoriesFeatured.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesIndustry.php b/openstack/code/user-stories/UserStoriesIndustry.php
index ece0ac1..0bcbd92 100644
--- a/openstack/code/user-stories/UserStoriesIndustry.php
+++ b/openstack/code/user-stories/UserStoriesIndustry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesLink.php b/openstack/code/user-stories/UserStoriesLink.php
index 99d2576..fc46ec7 100644
--- a/openstack/code/user-stories/UserStoriesLink.php
+++ b/openstack/code/user-stories/UserStoriesLink.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesSlides.php b/openstack/code/user-stories/UserStoriesSlides.php
index aa25ab0..03d8db9 100644
--- a/openstack/code/user-stories/UserStoriesSlides.php
+++ b/openstack/code/user-stories/UserStoriesSlides.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesTopics.php b/openstack/code/user-stories/UserStoriesTopics.php
index b883fe8..aaaf21d 100644
--- a/openstack/code/user-stories/UserStoriesTopics.php
+++ b/openstack/code/user-stories/UserStoriesTopics.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoriesTopicsFeatured.php b/openstack/code/user-stories/UserStoriesTopicsFeatured.php
index f3d6dac..80a55a1 100644
--- a/openstack/code/user-stories/UserStoriesTopicsFeatured.php
+++ b/openstack/code/user-stories/UserStoriesTopicsFeatured.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStory.php b/openstack/code/user-stories/UserStory.php
index 4790d78..b5f0d4a 100644
--- a/openstack/code/user-stories/UserStory.php
+++ b/openstack/code/user-stories/UserStory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/user-stories/UserStoryHolder.php b/openstack/code/user-stories/UserStoryHolder.php
index 6747dcb..65ba0ac 100644
--- a/openstack/code/user-stories/UserStoryHolder.php
+++ b/openstack/code/user-stories/UserStoryHolder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/ConditionalAndValidationRule.php b/openstack/code/utils/ConditionalAndValidationRule.php
index ef706b8..8da0255 100644
--- a/openstack/code/utils/ConditionalAndValidationRule.php
+++ b/openstack/code/utils/ConditionalAndValidationRule.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/CustomEmail.php b/openstack/code/utils/CustomEmail.php
index 7bbe7e6..397cb8d 100644
--- a/openstack/code/utils/CustomEmail.php
+++ b/openstack/code/utils/CustomEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/CustomHTMLFields/CustomTimeField.php b/openstack/code/utils/CustomHTMLFields/CustomTimeField.php
index 5029b5f..f67cd72 100644
--- a/openstack/code/utils/CustomHTMLFields/CustomTimeField.php
+++ b/openstack/code/utils/CustomHTMLFields/CustomTimeField.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/CustomHTMLFields/CustomUploadField.php b/openstack/code/utils/CustomHTMLFields/CustomUploadField.php
index b9ae6ec..dc81d9f 100644
--- a/openstack/code/utils/CustomHTMLFields/CustomUploadField.php
+++ b/openstack/code/utils/CustomHTMLFields/CustomUploadField.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/exceptions/EntityAlreadyExistsException.php b/openstack/code/utils/DDD/exceptions/EntityAlreadyExistsException.php
index 1d218f4..152baf4 100644
--- a/openstack/code/utils/DDD/exceptions/EntityAlreadyExistsException.php
+++ b/openstack/code/utils/DDD/exceptions/EntityAlreadyExistsException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/exceptions/EntityValidationException.php b/openstack/code/utils/DDD/exceptions/EntityValidationException.php
index 5a37513..5d068d0 100644
--- a/openstack/code/utils/DDD/exceptions/EntityValidationException.php
+++ b/openstack/code/utils/DDD/exceptions/EntityValidationException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/exceptions/InvalidAggregateRootException.php b/openstack/code/utils/DDD/exceptions/InvalidAggregateRootException.php
index d31d1db..2ec59c8 100644
--- a/openstack/code/utils/DDD/exceptions/InvalidAggregateRootException.php
+++ b/openstack/code/utils/DDD/exceptions/InvalidAggregateRootException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/exceptions/NotFoundEntityException.php b/openstack/code/utils/DDD/exceptions/NotFoundEntityException.php
index caed7b5..1d456ed 100644
--- a/openstack/code/utils/DDD/exceptions/NotFoundEntityException.php
+++ b/openstack/code/utils/DDD/exceptions/NotFoundEntityException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/exceptions/PolicyException.php b/openstack/code/utils/DDD/exceptions/PolicyException.php
index b341a07..c5a4595 100644
--- a/openstack/code/utils/DDD/exceptions/PolicyException.php
+++ b/openstack/code/utils/DDD/exceptions/PolicyException.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/AssociationFactory.php b/openstack/code/utils/DDD/infrastructure/AssociationFactory.php
index c4cf009..f72c07c 100644
--- a/openstack/code/utils/DDD/infrastructure/AssociationFactory.php
+++ b/openstack/code/utils/DDD/infrastructure/AssociationFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/Many2OneAssociation.php b/openstack/code/utils/DDD/infrastructure/Many2OneAssociation.php
index 3bfb040..3013871 100644
--- a/openstack/code/utils/DDD/infrastructure/Many2OneAssociation.php
+++ b/openstack/code/utils/DDD/infrastructure/Many2OneAssociation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/PersistentCollection.php b/openstack/code/utils/DDD/infrastructure/PersistentCollection.php
index c2835db..ca35dc1 100644
--- a/openstack/code/utils/DDD/infrastructure/PersistentCollection.php
+++ b/openstack/code/utils/DDD/infrastructure/PersistentCollection.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/SapphireTransactionManager.php b/openstack/code/utils/DDD/infrastructure/SapphireTransactionManager.php
index b7fe9eb..68c47b6 100644
--- a/openstack/code/utils/DDD/infrastructure/SapphireTransactionManager.php
+++ b/openstack/code/utils/DDD/infrastructure/SapphireTransactionManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/UnitOfWork.php b/openstack/code/utils/DDD/infrastructure/UnitOfWork.php
index bc4ad05..2f11c6e 100644
--- a/openstack/code/utils/DDD/infrastructure/UnitOfWork.php
+++ b/openstack/code/utils/DDD/infrastructure/UnitOfWork.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/repositories/SapphireRepository.php b/openstack/code/utils/DDD/infrastructure/repositories/SapphireRepository.php
index cfc03ae..55e69a5 100644
--- a/openstack/code/utils/DDD/infrastructure/repositories/SapphireRepository.php
+++ b/openstack/code/utils/DDD/infrastructure/repositories/SapphireRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/infrastructure/services/SapphireFileUploadService.php b/openstack/code/utils/DDD/infrastructure/services/SapphireFileUploadService.php
index 196db6c..e6ff757 100644
--- a/openstack/code/utils/DDD/infrastructure/services/SapphireFileUploadService.php
+++ b/openstack/code/utils/DDD/infrastructure/services/SapphireFileUploadService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/model/AbstractEntityManager.php b/openstack/code/utils/DDD/model/AbstractEntityManager.php
index 998ef5d..021a060 100644
--- a/openstack/code/utils/DDD/model/AbstractEntityManager.php
+++ b/openstack/code/utils/DDD/model/AbstractEntityManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/model/AbstractEntityRepository.php b/openstack/code/utils/DDD/model/AbstractEntityRepository.php
index 352e039..e4abc2c 100644
--- a/openstack/code/utils/DDD/model/AbstractEntityRepository.php
+++ b/openstack/code/utils/DDD/model/AbstractEntityRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/model/IEntity.php b/openstack/code/utils/DDD/model/IEntity.php
index 622894b..b9fdd91 100644
--- a/openstack/code/utils/DDD/model/IEntity.php
+++ b/openstack/code/utils/DDD/model/IEntity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/model/IEntityRepository.php b/openstack/code/utils/DDD/model/IEntityRepository.php
index 1fbc066..9ecb4bc 100644
--- a/openstack/code/utils/DDD/model/IEntityRepository.php
+++ b/openstack/code/utils/DDD/model/IEntityRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/model/IManipulableEntity.php b/openstack/code/utils/DDD/model/IManipulableEntity.php
index 5edc0a3..38dd2ab 100644
--- a/openstack/code/utils/DDD/model/IManipulableEntity.php
+++ b/openstack/code/utils/DDD/model/IManipulableEntity.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/services/SessionCacheService.php b/openstack/code/utils/DDD/services/SessionCacheService.php
index 6255e48..42c49cb 100644
--- a/openstack/code/utils/DDD/services/SessionCacheService.php
+++ b/openstack/code/utils/DDD/services/SessionCacheService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/services/ValidatorService.php b/openstack/code/utils/DDD/services/ValidatorService.php
index 8ad82f4..ec35e65 100644
--- a/openstack/code/utils/DDD/services/ValidatorService.php
+++ b/openstack/code/utils/DDD/services/ValidatorService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/GeoCodingQueryResult.php b/openstack/code/utils/DDD/utils/GeoCodingQueryResult.php
index 9abc27b..eb649f8 100644
--- a/openstack/code/utils/DDD/utils/GeoCodingQueryResult.php
+++ b/openstack/code/utils/DDD/utils/GeoCodingQueryResult.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/GoogleGeoCodingService.php b/openstack/code/utils/DDD/utils/GoogleGeoCodingService.php
index d8aa126..3bd4a96 100644
--- a/openstack/code/utils/DDD/utils/GoogleGeoCodingService.php
+++ b/openstack/code/utils/DDD/utils/GoogleGeoCodingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/ICacheService.php b/openstack/code/utils/DDD/utils/ICacheService.php
index acdee6a..b53d8b2 100644
--- a/openstack/code/utils/DDD/utils/ICacheService.php
+++ b/openstack/code/utils/DDD/utils/ICacheService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IFileUploadService.php b/openstack/code/utils/DDD/utils/IFileUploadService.php
index f7aa6ec..dd807d3 100644
--- a/openstack/code/utils/DDD/utils/IFileUploadService.php
+++ b/openstack/code/utils/DDD/utils/IFileUploadService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IGeoCodingQuery.php b/openstack/code/utils/DDD/utils/IGeoCodingQuery.php
index 8b795d7..d76e315 100644
--- a/openstack/code/utils/DDD/utils/IGeoCodingQuery.php
+++ b/openstack/code/utils/DDD/utils/IGeoCodingQuery.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IGeoCodingQueryCacheService.php b/openstack/code/utils/DDD/utils/IGeoCodingQueryCacheService.php
index d68fcfa..7c8d77f 100644
--- a/openstack/code/utils/DDD/utils/IGeoCodingQueryCacheService.php
+++ b/openstack/code/utils/DDD/utils/IGeoCodingQueryCacheService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IGeoCodingQueryRepository.php b/openstack/code/utils/DDD/utils/IGeoCodingQueryRepository.php
index 02f9f36..4f0560f 100644
--- a/openstack/code/utils/DDD/utils/IGeoCodingQueryRepository.php
+++ b/openstack/code/utils/DDD/utils/IGeoCodingQueryRepository.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IGeoCodingService.php b/openstack/code/utils/DDD/utils/IGeoCodingService.php
index 24eb2eb..b3793ac 100644
--- a/openstack/code/utils/DDD/utils/IGeoCodingService.php
+++ b/openstack/code/utils/DDD/utils/IGeoCodingService.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IQueryHandler.php b/openstack/code/utils/DDD/utils/IQueryHandler.php
index 3ba638c..2e874e3 100644
--- a/openstack/code/utils/DDD/utils/IQueryHandler.php
+++ b/openstack/code/utils/DDD/utils/IQueryHandler.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IQueryResult.php b/openstack/code/utils/DDD/utils/IQueryResult.php
index 1778206..68889d3 100644
--- a/openstack/code/utils/DDD/utils/IQueryResult.php
+++ b/openstack/code/utils/DDD/utils/IQueryResult.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IQuerySpecification.php b/openstack/code/utils/DDD/utils/IQuerySpecification.php
index 694e874..c68e147 100644
--- a/openstack/code/utils/DDD/utils/IQuerySpecification.php
+++ b/openstack/code/utils/DDD/utils/IQuerySpecification.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/ITransactionManager.php b/openstack/code/utils/DDD/utils/ITransactionManager.php
index 97e510f..951b4cd 100644
--- a/openstack/code/utils/DDD/utils/ITransactionManager.php
+++ b/openstack/code/utils/DDD/utils/ITransactionManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IUnitOfWork.php b/openstack/code/utils/DDD/utils/IUnitOfWork.php
index f01e1e1..012a2e5 100644
--- a/openstack/code/utils/DDD/utils/IUnitOfWork.php
+++ b/openstack/code/utils/DDD/utils/IUnitOfWork.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IUtilFactory.php b/openstack/code/utils/DDD/utils/IUtilFactory.php
index 0d561c2..a442c9e 100644
--- a/openstack/code/utils/DDD/utils/IUtilFactory.php
+++ b/openstack/code/utils/DDD/utils/IUtilFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IValidator.php b/openstack/code/utils/DDD/utils/IValidator.php
index ff639fb..1921462 100644
--- a/openstack/code/utils/DDD/utils/IValidator.php
+++ b/openstack/code/utils/DDD/utils/IValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/IValidatorFactory.php b/openstack/code/utils/DDD/utils/IValidatorFactory.php
index de70a65..c5af0d1 100644
--- a/openstack/code/utils/DDD/utils/IValidatorFactory.php
+++ b/openstack/code/utils/DDD/utils/IValidatorFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/QueryAlias.php b/openstack/code/utils/DDD/utils/QueryAlias.php
index 5f7e60a..e2e812c 100644
--- a/openstack/code/utils/DDD/utils/QueryAlias.php
+++ b/openstack/code/utils/DDD/utils/QueryAlias.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/QueryCriteria.php b/openstack/code/utils/DDD/utils/QueryCriteria.php
index 3880ee4..1598194 100644
--- a/openstack/code/utils/DDD/utils/QueryCriteria.php
+++ b/openstack/code/utils/DDD/utils/QueryCriteria.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/QueryObject.php b/openstack/code/utils/DDD/utils/QueryObject.php
index 4630eb5..02d16bb 100644
--- a/openstack/code/utils/DDD/utils/QueryObject.php
+++ b/openstack/code/utils/DDD/utils/QueryObject.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DDD/utils/QueryOrder.php b/openstack/code/utils/DDD/utils/QueryOrder.php
index de7f561..ebaa557 100644
--- a/openstack/code/utils/DDD/utils/QueryOrder.php
+++ b/openstack/code/utils/DDD/utils/QueryOrder.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/DateTimeUtils.php b/openstack/code/utils/DateTimeUtils.php
index 042b3c7..c5b39eb 100644
--- a/openstack/code/utils/DateTimeUtils.php
+++ b/openstack/code/utils/DateTimeUtils.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/EmailUtils.php b/openstack/code/utils/EmailUtils.php
index 9fff727..b5e50f9 100644
--- a/openstack/code/utils/EmailUtils.php
+++ b/openstack/code/utils/EmailUtils.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/EntityCounter.php b/openstack/code/utils/EntityCounter.php
index eda9192..73535f1 100644
--- a/openstack/code/utils/EntityCounter.php
+++ b/openstack/code/utils/EntityCounter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/EntityCounterHelper.php b/openstack/code/utils/EntityCounterHelper.php
index 69b27ec..c79ad9f 100644
--- a/openstack/code/utils/EntityCounterHelper.php
+++ b/openstack/code/utils/EntityCounterHelper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/FileRequiredFields.php b/openstack/code/utils/FileRequiredFields.php
index 36c70f1..d75de61 100644
--- a/openstack/code/utils/FileRequiredFields.php
+++ b/openstack/code/utils/FileRequiredFields.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/FileUtils.php b/openstack/code/utils/FileUtils.php
index 3f499a0..e763e6a 100644
--- a/openstack/code/utils/FileUtils.php
+++ b/openstack/code/utils/FileUtils.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/HoneyPotForm.php b/openstack/code/utils/HoneyPotForm.php
index a9d7818..d4f9709 100644
--- a/openstack/code/utils/HoneyPotForm.php
+++ b/openstack/code/utils/HoneyPotForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/HtmlPurifierRequiredValidator.php b/openstack/code/utils/HtmlPurifierRequiredValidator.php
index 7d135a8..5f69c3f 100644
--- a/openstack/code/utils/HtmlPurifierRequiredValidator.php
+++ b/openstack/code/utils/HtmlPurifierRequiredValidator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/Iconifier.php b/openstack/code/utils/Iconifier.php
index 6847d5a..3856e59 100755
--- a/openstack/code/utils/Iconifier.php
+++ b/openstack/code/utils/Iconifier.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/ModelAsControllerCustom.php b/openstack/code/utils/ModelAsControllerCustom.php
index 0373c37..f61d42c 100644
--- a/openstack/code/utils/ModelAsControllerCustom.php
+++ b/openstack/code/utils/ModelAsControllerCustom.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/MultiDropdownField.php b/openstack/code/utils/MultiDropdownField.php
index 3335a8d..21de9d0 100644
--- a/openstack/code/utils/MultiDropdownField.php
+++ b/openstack/code/utils/MultiDropdownField.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/MyCustomIteratorFunctions.php b/openstack/code/utils/MyCustomIteratorFunctions.php
index d4f66c9..15d549c 100644
--- a/openstack/code/utils/MyCustomIteratorFunctions.php
+++ b/openstack/code/utils/MyCustomIteratorFunctions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/PublisherSubscriberManager.php b/openstack/code/utils/PublisherSubscriberManager.php
index 1c34e1d..f81e214 100644
--- a/openstack/code/utils/PublisherSubscriberManager.php
+++ b/openstack/code/utils/PublisherSubscriberManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/Upload_Image_Validator.php b/openstack/code/utils/Upload_Image_Validator.php
index a829079..11b21e5 100644
--- a/openstack/code/utils/Upload_Image_Validator.php
+++ b/openstack/code/utils/Upload_Image_Validator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/UserLanguage.php b/openstack/code/utils/UserLanguage.php
index b7daf2c..4f24e40 100644
--- a/openstack/code/utils/UserLanguage.php
+++ b/openstack/code/utils/UserLanguage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/Zipper.php b/openstack/code/utils/Zipper.php
index 3d76c3d..bb56720 100755
--- a/openstack/code/utils/Zipper.php
+++ b/openstack/code/utils/Zipper.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/arrays/ArrayUtils.php b/openstack/code/utils/arrays/ArrayUtils.php
index 8febbbe..a2e3b4c 100644
--- a/openstack/code/utils/arrays/ArrayUtils.php
+++ b/openstack/code/utils/arrays/ArrayUtils.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/csv/CSVExporter.php b/openstack/code/utils/csv/CSVExporter.php
index 617349a..d246bd8 100644
--- a/openstack/code/utils/csv/CSVExporter.php
+++ b/openstack/code/utils/csv/CSVExporter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/csv/CSVReader.php b/openstack/code/utils/csv/CSVReader.php
index f685b59..523b496 100644
--- a/openstack/code/utils/csv/CSVReader.php
+++ b/openstack/code/utils/csv/CSVReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/datasources/CvsDataSourceReader.php b/openstack/code/utils/datasources/CvsDataSourceReader.php
index 716b185..59f81c2 100644
--- a/openstack/code/utils/datasources/CvsDataSourceReader.php
+++ b/openstack/code/utils/datasources/CvsDataSourceReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/datasources/SequentialDataSourceReader.php b/openstack/code/utils/datasources/SequentialDataSourceReader.php
index 023d0eb..3b58a4b 100644
--- a/openstack/code/utils/datasources/SequentialDataSourceReader.php
+++ b/openstack/code/utils/datasources/SequentialDataSourceReader.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/email/DevelopmentEmail.php b/openstack/code/utils/email/DevelopmentEmail.php
index db4fb14..ce016bb 100644
--- a/openstack/code/utils/email/DevelopmentEmail.php
+++ b/openstack/code/utils/email/DevelopmentEmail.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/email/EmailFactory.php b/openstack/code/utils/email/EmailFactory.php
index bfca2e6..535e3b0 100644
--- a/openstack/code/utils/email/EmailFactory.php
+++ b/openstack/code/utils/email/EmailFactory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/loggers/Custom_SS_LogEmailWriter.php b/openstack/code/utils/loggers/Custom_SS_LogEmailWriter.php
index 2e07d13..996c163 100644
--- a/openstack/code/utils/loggers/Custom_SS_LogEmailWriter.php
+++ b/openstack/code/utils/loggers/Custom_SS_LogEmailWriter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/openstack/code/utils/loggers/SS_CustomLogErrorEmailFormatter.php b/openstack/code/utils/loggers/SS_CustomLogErrorEmailFormatter.php
index f9bc8f3..5e1fb6d 100644
--- a/openstack/code/utils/loggers/SS_CustomLogErrorEmailFormatter.php
+++ b/openstack/code/utils/loggers/SS_CustomLogErrorEmailFormatter.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/_config.php b/registration/_config.php
index d49d344..3d4fef6 100644
--- a/registration/_config.php
+++ b/registration/_config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/Affiliation.php b/registration/code/Affiliation.php
index c5d3269..3330463 100644
--- a/registration/code/Affiliation.php
+++ b/registration/code/Affiliation.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/AffiliationController.php b/registration/code/AffiliationController.php
index b7bf63f..5258d24 100644
--- a/registration/code/AffiliationController.php
+++ b/registration/code/AffiliationController.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/AffiliationEditForm.php b/registration/code/AffiliationEditForm.php
index 8827621..37daada 100644
--- a/registration/code/AffiliationEditForm.php
+++ b/registration/code/AffiliationEditForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/CustomSiteConfigRegistration.php b/registration/code/CustomSiteConfigRegistration.php
index ceafc48..14888c1 100644
--- a/registration/code/CustomSiteConfigRegistration.php
+++ b/registration/code/CustomSiteConfigRegistration.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/EditProfileForm.php b/registration/code/EditProfileForm.php
index f77c60d..fdcf166 100644
--- a/registration/code/EditProfileForm.php
+++ b/registration/code/EditProfileForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/EditProfilePage.php b/registration/code/EditProfilePage.php
index 3f3d348..b24cc28 100755
--- a/registration/code/EditProfilePage.php
+++ b/registration/code/EditProfilePage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/EditSpeakerProfileForm.php b/registration/code/EditSpeakerProfileForm.php
index f8a46f3..62b5b18 100644
--- a/registration/code/EditSpeakerProfileForm.php
+++ b/registration/code/EditSpeakerProfileForm.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/MemberDecorator.php b/registration/code/MemberDecorator.php
index 6f6b951..db641a0 100644
--- a/registration/code/MemberDecorator.php
+++ b/registration/code/MemberDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/OrganizationRegistrationRequest.php b/registration/code/OrganizationRegistrationRequest.php
index d5940ef..08a2241 100644
--- a/registration/code/OrganizationRegistrationRequest.php
+++ b/registration/code/OrganizationRegistrationRequest.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/RegistrationPage.php b/registration/code/RegistrationPage.php
index 8acc567..b58672f 100755
--- a/registration/code/RegistrationPage.php
+++ b/registration/code/RegistrationPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/SecurityAdminDecorator.php b/registration/code/SecurityAdminDecorator.php
index 32c2044..554cb52 100644
--- a/registration/code/SecurityAdminDecorator.php
+++ b/registration/code/SecurityAdminDecorator.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/code/SpeakerVotingRegistrationPage.php b/registration/code/SpeakerVotingRegistrationPage.php
index c9a3cbc..7b7aa26 100644
--- a/registration/code/SpeakerVotingRegistrationPage.php
+++ b/registration/code/SpeakerVotingRegistrationPage.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/javascript/affiliations.js b/registration/javascript/affiliations.js
index 74fe09e..8c7c9b0 100644
--- a/registration/javascript/affiliations.js
+++ b/registration/javascript/affiliations.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/javascript/edit.profile.page.js b/registration/javascript/edit.profile.page.js
index 7d13725..751c107 100755
--- a/registration/javascript/edit.profile.page.js
+++ b/registration/javascript/edit.profile.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/javascript/edit.profile.training.form.js b/registration/javascript/edit.profile.training.form.js
index 8307ae8..b67759a 100644
--- a/registration/javascript/edit.profile.training.form.js
+++ b/registration/javascript/edit.profile.training.form.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/javascript/edit.profile.training.js b/registration/javascript/edit.profile.training.js
index 7d9bbf0..a5b8c9a 100644
--- a/registration/javascript/edit.profile.training.js
+++ b/registration/javascript/edit.profile.training.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/registration/javascript/registration.page.js b/registration/javascript/registration.page.js
index f936158..bd3a497 100755
--- a/registration/javascript/registration.page.js
+++ b/registration/javascript/registration.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/Signin.js b/themes/openstack/javascript/Signin.js
index 14b5cc1..d3c6fc9 100644
--- a/themes/openstack/javascript/Signin.js
+++ b/themes/openstack/javascript/Signin.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/anniversary.3.js b/themes/openstack/javascript/anniversary.3.js
index 8d170a1..2a28830 100644
--- a/themes/openstack/javascript/anniversary.3.js
+++ b/themes/openstack/javascript/anniversary.3.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/anniversary.4.js b/themes/openstack/javascript/anniversary.4.js
index 0dd3112..753de75 100644
--- a/themes/openstack/javascript/anniversary.4.js
+++ b/themes/openstack/javascript/anniversary.4.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/community.js b/themes/openstack/javascript/community.js
index 6f15c81..d060ba6 100644
--- a/themes/openstack/javascript/community.js
+++ b/themes/openstack/javascript/community.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/companies.js b/themes/openstack/javascript/companies.js
index f1a0f51..108281c 100644
--- a/themes/openstack/javascript/companies.js
+++ b/themes/openstack/javascript/companies.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/company.list.page.js b/themes/openstack/javascript/company.list.page.js
index 25e969e..951aa9c 100644
--- a/themes/openstack/javascript/company.list.page.js
+++ b/themes/openstack/javascript/company.list.page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/compute.js b/themes/openstack/javascript/compute.js
index 2ca5f52..f15fa6b 100644
--- a/themes/openstack/javascript/compute.js
+++ b/themes/openstack/javascript/compute.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/deployment.survey.filters.js b/themes/openstack/javascript/deployment.survey.filters.js
index b805681..c6767ec 100644
--- a/themes/openstack/javascript/deployment.survey.filters.js
+++ b/themes/openstack/javascript/deployment.survey.filters.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/deployment.survey.org.info.form.js b/themes/openstack/javascript/deployment.survey.org.info.form.js
index ebc4ff6..0959395 100644
--- a/themes/openstack/javascript/deployment.survey.org.info.form.js
+++ b/themes/openstack/javascript/deployment.survey.org.info.form.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/essex.js b/themes/openstack/javascript/essex.js
index d98ab16..6297dcb 100644
--- a/themes/openstack/javascript/essex.js
+++ b/themes/openstack/javascript/essex.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/filetracking.jquery.js b/themes/openstack/javascript/filetracking.jquery.js
index 93ce216..43ee78c 100644
--- a/themes/openstack/javascript/filetracking.jquery.js
+++ b/themes/openstack/javascript/filetracking.jquery.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/filter.js b/themes/openstack/javascript/filter.js
index 7254e60..c2317bd 100644
--- a/themes/openstack/javascript/filter.js
+++ b/themes/openstack/javascript/filter.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/folsom.js b/themes/openstack/javascript/folsom.js
index 2cd85fd..4e3fcca 100644
--- a/themes/openstack/javascript/folsom.js
+++ b/themes/openstack/javascript/folsom.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/home.js b/themes/openstack/javascript/home.js
index c15fbf0..5aacfd6 100644
--- a/themes/openstack/javascript/home.js
+++ b/themes/openstack/javascript/home.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/image-service.js b/themes/openstack/javascript/image-service.js
index ad98433..871c457 100644
--- a/themes/openstack/javascript/image-service.js
+++ b/themes/openstack/javascript/image-service.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/jquery.serialize.js b/themes/openstack/javascript/jquery.serialize.js
index fd224e5..e63b202 100644
--- a/themes/openstack/javascript/jquery.serialize.js
+++ b/themes/openstack/javascript/jquery.serialize.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/jquery.validate.custom.methods.js b/themes/openstack/javascript/jquery.validate.custom.methods.js
index 9167e04..c373e42 100644
--- a/themes/openstack/javascript/jquery.validate.custom.methods.js
+++ b/themes/openstack/javascript/jquery.validate.custom.methods.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/marketing.js b/themes/openstack/javascript/marketing.js
index 387ea64..b3268b6 100755
--- a/themes/openstack/javascript/marketing.js
+++ b/themes/openstack/javascript/marketing.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/navigation.js b/themes/openstack/javascript/navigation.js
index 4f0fc5d..47b1acc 100644
--- a/themes/openstack/javascript/navigation.js
+++ b/themes/openstack/javascript/navigation.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/openstack-compute.js b/themes/openstack/javascript/openstack-compute.js
index c1e57d4..aa95b01 100644
--- a/themes/openstack/javascript/openstack-compute.js
+++ b/themes/openstack/javascript/openstack-compute.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/openstack-home.js b/themes/openstack/javascript/openstack-home.js
index 99de26a..3884251 100644
--- a/themes/openstack/javascript/openstack-home.js
+++ b/themes/openstack/javascript/openstack-home.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/openstack-networking.js b/themes/openstack/javascript/openstack-networking.js
index dcd4301..b62658a 100644
--- a/themes/openstack/javascript/openstack-networking.js
+++ b/themes/openstack/javascript/openstack-networking.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/openstack-storage.js b/themes/openstack/javascript/openstack-storage.js
index c1e57d4..aa95b01 100644
--- a/themes/openstack/javascript/openstack-storage.js
+++ b/themes/openstack/javascript/openstack-storage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/querystring.jquery.js b/themes/openstack/javascript/querystring.jquery.js
index 86dce83..62cec04 100644
--- a/themes/openstack/javascript/querystring.jquery.js
+++ b/themes/openstack/javascript/querystring.jquery.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/simple-tinymce.js b/themes/openstack/javascript/simple-tinymce.js
index 2c4e4d7..9d55151 100644
--- a/themes/openstack/javascript/simple-tinymce.js
+++ b/themes/openstack/javascript/simple-tinymce.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/speaker-submissions.js b/themes/openstack/javascript/speaker-submissions.js
index 5962ea3..c83fa7a 100644
--- a/themes/openstack/javascript/speaker-submissions.js
+++ b/themes/openstack/javascript/speaker-submissions.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/speaker-voting-page.js b/themes/openstack/javascript/speaker-voting-page.js
index cf549d6..646e359 100644
--- a/themes/openstack/javascript/speaker-voting-page.js
+++ b/themes/openstack/javascript/speaker-voting-page.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/speakers-disabled.js b/themes/openstack/javascript/speakers-disabled.js
index 8684bb9..a4c1496 100644
--- a/themes/openstack/javascript/speakers-disabled.js
+++ b/themes/openstack/javascript/speakers-disabled.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/sponsorspage.js b/themes/openstack/javascript/sponsorspage.js
index b38b71f..7ccf50d 100644
--- a/themes/openstack/javascript/sponsorspage.js
+++ b/themes/openstack/javascript/sponsorspage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/storage.js b/themes/openstack/javascript/storage.js
index ad98433..871c457 100644
--- a/themes/openstack/javascript/storage.js
+++ b/themes/openstack/javascript/storage.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at
diff --git a/themes/openstack/javascript/users.js b/themes/openstack/javascript/users.js
index 89fd098..a26412e 100644
--- a/themes/openstack/javascript/users.js
+++ b/themes/openstack/javascript/users.js
@@ -1,5 +1,5 @@
 /**
- * Copyright 2014 Openstack.org
+ * Copyright 2014 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 a copy of the License at