diff --git a/lib/arch/aarch64/cache_helpers.S b/lib/arch/aarch64/cache_helpers.S
index b8a5608..d54ecbc 100644
--- a/lib/arch/aarch64/cache_helpers.S
+++ b/lib/arch/aarch64/cache_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/arch/aarch64/misc_helpers.S b/lib/arch/aarch64/misc_helpers.S
index e36fdfa..08a568e 100644
--- a/lib/arch/aarch64/misc_helpers.S
+++ b/lib/arch/aarch64/misc_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/arch/aarch64/sysreg_helpers.S b/lib/arch/aarch64/sysreg_helpers.S
index e68192f..c53f952 100644
--- a/lib/arch/aarch64/sysreg_helpers.S
+++ b/lib/arch/aarch64/sysreg_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/arch/aarch64/tlb_helpers.S b/lib/arch/aarch64/tlb_helpers.S
index eef7546..1706cd2 100644
--- a/lib/arch/aarch64/tlb_helpers.S
+++ b/lib/arch/aarch64/tlb_helpers.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/mmio.c b/lib/mmio.c
index bf35e36..802b1ef 100644
--- a/lib/mmio.c
+++ b/lib/mmio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/non-semihosting/ctype.h b/lib/non-semihosting/ctype.h
index 88e7da1..52870b4 100644
--- a/lib/non-semihosting/ctype.h
+++ b/lib/non-semihosting/ctype.h
@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: include/lib/ctype.h
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #ifndef _SYS_CTYPE_H_
diff --git a/lib/non-semihosting/mem.c b/lib/non-semihosting/mem.c
index bca9ab5..e072710 100644
--- a/lib/non-semihosting/mem.c
+++ b/lib/non-semihosting/mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/non-semihosting/std.c b/lib/non-semihosting/std.c
index ea91d5f..1c1c807 100644
--- a/lib/non-semihosting/std.c
+++ b/lib/non-semihosting/std.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/non-semihosting/strcmp.c b/lib/non-semihosting/strcmp.c
index e5921ba..21c248e 100644
--- a/lib/non-semihosting/strcmp.c
+++ b/lib/non-semihosting/strcmp.c
@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strcmp.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 /*
diff --git a/lib/non-semihosting/string.c b/lib/non-semihosting/string.c
index 5bb01a1..01ffdc7 100644
--- a/lib/non-semihosting/string.c
+++ b/lib/non-semihosting/string.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/non-semihosting/strlen.c b/lib/non-semihosting/strlen.c
index 5c1e7a6..a388fe4 100644
--- a/lib/non-semihosting/strlen.c
+++ b/lib/non-semihosting/strlen.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strlen.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include <stddef.h>
diff --git a/lib/non-semihosting/strncmp.c b/lib/non-semihosting/strncmp.c
index 984b7a0..beb90ec 100644
--- a/lib/non-semihosting/strncmp.c
+++ b/lib/non-semihosting/strncmp.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncmp.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"
diff --git a/lib/non-semihosting/strncpy.c b/lib/non-semihosting/strncpy.c
index 56a8a69..31a4332 100644
--- a/lib/non-semihosting/strncpy.c
+++ b/lib/non-semihosting/strncpy.c
@@ -31,9 +31,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strncpy.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"
diff --git a/lib/non-semihosting/strsep.c b/lib/non-semihosting/strsep.c
index 1f80af4..555a478 100644
--- a/lib/non-semihosting/strsep.c
+++ b/lib/non-semihosting/strsep.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strsep.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"
diff --git a/lib/non-semihosting/strtol.c b/lib/non-semihosting/strtol.c
index 4a5a404..f743c41 100644
--- a/lib/non-semihosting/strtol.c
+++ b/lib/non-semihosting/strtol.c
@@ -33,9 +33,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtol.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"
diff --git a/lib/non-semihosting/strtoull.c b/lib/non-semihosting/strtoull.c
index e46ef4c..61b41f3 100644
--- a/lib/non-semihosting/strtoull.c
+++ b/lib/non-semihosting/strtoull.c
@@ -28,9 +28,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/strtoull.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 #include "types.h"
diff --git a/lib/non-semihosting/subr_prf.c b/lib/non-semihosting/subr_prf.c
index 6e2a1ac..0056c81 100644
--- a/lib/non-semihosting/subr_prf.c
+++ b/lib/non-semihosting/subr_prf.c
@@ -35,9 +35,7 @@
  */
 
 /*
- * Portions copyright (c) 2009-2013, ARM Ltd. All rights reserved.
- * ---------------------------------------------------------------
- * File: lib/subr_prf.c
+ * Portions copyright (c) 2009-2013, ARM Limited and Contributors. All rights reserved.
  */
 
 /*
diff --git a/lib/semihosting/aarch64/semihosting_call.S b/lib/semihosting/aarch64/semihosting_call.S
index cc72ec2..f206723 100644
--- a/lib/semihosting/aarch64/semihosting_call.S
+++ b/lib/semihosting/aarch64/semihosting_call.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c
index 558973a..528db17 100644
--- a/lib/semihosting/semihosting.c
+++ b/lib/semihosting/semihosting.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/sync/locks/bakery/bakery_lock.c b/lib/sync/locks/bakery/bakery_lock.c
index d3c780c..dab4a75 100644
--- a/lib/sync/locks/bakery/bakery_lock.c
+++ b/lib/sync/locks/bakery/bakery_lock.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
diff --git a/lib/sync/locks/exclusive/spinlock.S b/lib/sync/locks/exclusive/spinlock.S
index 4269d95..aedc312 100644
--- a/lib/sync/locks/exclusive/spinlock.S
+++ b/lib/sync/locks/exclusive/spinlock.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, ARM Limited. All rights reserved.
+ * Copyright (c) 2013, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: