riscv: fix licenses

NICTA_BSD -> DATA61_BSD

libsel4allocman/sel4_arch/riscv/allocman/sel4_arch/mapping.h

diff --git a/libsel4allocman/sel4_arch/riscv/allocman/sel4_arch/mapping.h b/libsel4allocman/sel4_arch/riscv/allocman/sel4_arch/mapping.h
index 4681ba8..6662010 100644
--- a/libsel4allocman/sel4_arch/riscv/allocman/sel4_arch/mapping.h
+++ b/libsel4allocman/sel4_arch/riscv/allocman/sel4_arch/mapping.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef __ALLOCMAN_SEL4_ARCH_MAPPING__
 #define __ALLOCMAN_SEL4_ARCH_MAPPING__
 

libsel4debug/arch_include/riscv/sel4debug/arch/registers.h

diff --git a/libsel4debug/arch_include/riscv/sel4debug/arch/registers.h b/libsel4debug/arch_include/riscv/sel4debug/arch/registers.h
index 11d9062..98e9848 100644
--- a/libsel4debug/arch_include/riscv/sel4debug/arch/registers.h
+++ b/libsel4debug/arch_include/riscv/sel4debug/arch/registers.h
@@ -1,4 +1,14 @@
-
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */
 #ifndef __DEBUG_ARCH_REGISTERS_H
 #define __DEBUG_ARCH_REGISTERS_H
 

libsel4platsupport/arch_include/riscv/sel4platsupport/arch/device.h

diff --git a/libsel4platsupport/arch_include/riscv/sel4platsupport/arch/device.h b/libsel4platsupport/arch_include/riscv/sel4platsupport/arch/device.h
index 8b13789..8a381b3 100644
--- a/libsel4platsupport/arch_include/riscv/sel4platsupport/arch/device.h
+++ b/libsel4platsupport/arch_include/riscv/sel4platsupport/arch/device.h
@@ -1 +1,11 @@
-
+/*
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
+ *
+ * This software may be distributed and modified according to the terms of
+ * the BSD 2-Clause license. Note that NO WARRANTY is provided.
+ * See "LICENSE_BSD2.txt" for details.
+ *
+ * @TAG(DATA61_BSD)
+ */

libsel4platsupport/src/arch/riscv/crt0.S

diff --git a/libsel4platsupport/src/arch/riscv/crt0.S b/libsel4platsupport/src/arch/riscv/crt0.S
index 1971cdb..14b327d 100644
--- a/libsel4platsupport/src/arch/riscv/crt0.S
+++ b/libsel4platsupport/src/arch/riscv/crt0.S
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 /*
  * A default crt0 for ARM. It does the bare minimum required to get into

libsel4platsupport/src/arch/riscv/sel4_crt0.S

diff --git a/libsel4platsupport/src/arch/riscv/sel4_crt0.S b/libsel4platsupport/src/arch/riscv/sel4_crt0.S
index a4ee476..565e4ed 100644
--- a/libsel4platsupport/src/arch/riscv/sel4_crt0.S
+++ b/libsel4platsupport/src/arch/riscv/sel4_crt0.S
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 /*
  * A default seL4 crt0 for arm. It does the bare minimum required to emulate

libsel4platsupport/src/arch/riscv/timer.c

diff --git a/libsel4platsupport/src/arch/riscv/timer.c b/libsel4platsupport/src/arch/riscv/timer.c
index 80e2051..fa1198d 100644
--- a/libsel4platsupport/src/arch/riscv/timer.c
+++ b/libsel4platsupport/src/arch/riscv/timer.c
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #include <autoconf.h>
 #include <vka/vka.h>

libsel4platsupport/src/sel4_arch/riscv/sel4_crt0.S

diff --git a/libsel4platsupport/src/sel4_arch/riscv/sel4_crt0.S b/libsel4platsupport/src/sel4_arch/riscv/sel4_crt0.S
index ccd64a8..45d4a62 100644
--- a/libsel4platsupport/src/sel4_arch/riscv/sel4_crt0.S
+++ b/libsel4platsupport/src/sel4_arch/riscv/sel4_crt0.S
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 /*
  * A default seL4 crt0 for arm. It does the bare minimum required to emulate

libsel4simple-default/src/arch/riscv/default.c

diff --git a/libsel4simple-default/src/arch/riscv/default.c b/libsel4simple-default/src/arch/riscv/default.c
index 33062f6..2bf7157 100644
--- a/libsel4simple-default/src/arch/riscv/default.c
+++ b/libsel4simple-default/src/arch/riscv/default.c
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #include <autoconf.h>
 
 #include <stdio.h>

libsel4simple/arch_include/riscv/simple/arch/simple.h

diff --git a/libsel4simple/arch_include/riscv/simple/arch/simple.h b/libsel4simple/arch_include/riscv/simple/arch/simple.h
index b48545c..ce31b4a 100644
--- a/libsel4simple/arch_include/riscv/simple/arch/simple.h
+++ b/libsel4simple/arch_include/riscv/simple/arch/simple.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _INTERFACE_ARCH_SIMPLE_H_
 #define _INTERFACE_ARCH_SIMPLE_H_
 

libsel4utils/arch_include/riscv/sel4utils/arch/cache.h

diff --git a/libsel4utils/arch_include/riscv/sel4utils/arch/cache.h b/libsel4utils/arch_include/riscv/sel4utils/arch/cache.h
index e08481a..74ffe63 100644
--- a/libsel4utils/arch_include/riscv/sel4utils/arch/cache.h
+++ b/libsel4utils/arch_include/riscv/sel4utils/arch/cache.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef SEL4UTILS_ARCH_CACHE_H
 #define SEL4UTILS_ARCH_CACHE_H

libsel4utils/arch_include/riscv/sel4utils/arch/mapping.h

diff --git a/libsel4utils/arch_include/riscv/sel4utils/arch/mapping.h b/libsel4utils/arch_include/riscv/sel4utils/arch/mapping.h
index c389823..5ae9ebc 100644
--- a/libsel4utils/arch_include/riscv/sel4utils/arch/mapping.h
+++ b/libsel4utils/arch_include/riscv/sel4utils/arch/mapping.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef _SEL4UTILS_ARCH_MAPPING_H
 #define _SEL4UTILS_ARCH_MAPPING_H

libsel4utils/arch_include/riscv/sel4utils/arch/util.h

diff --git a/libsel4utils/arch_include/riscv/sel4utils/arch/util.h b/libsel4utils/arch_include/riscv/sel4utils/arch/util.h
index 81109a1..345ec9c 100644
--- a/libsel4utils/arch_include/riscv/sel4utils/arch/util.h
+++ b/libsel4utils/arch_include/riscv/sel4utils/arch/util.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef _SEL4UTILS_ARCH_UTIL_H
 #define _SEL4UTILS_ARCH_UTIL_H

libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/mapping.h

diff --git a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/mapping.h b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/mapping.h
index 359762a..d7b9155 100644
--- a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/mapping.h
+++ b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/mapping.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef _SEL4UTILS_SEL4_ARCH_MAPPING_H
 #define _SEL4UTILS_SEL4_ARCH_MAPPING_H

libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/util.h

diff --git a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/util.h b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/util.h
index d5ad27d..45d734a 100644
--- a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/util.h
+++ b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/util.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef _SEL4UTILS_SEL4_ARCH_UTIL_H
 #define _SEL4UTILS_SEL4_ARCH_UTIL_H

libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/vspace.h

diff --git a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/vspace.h b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/vspace.h
index a3e0ac5..10d54e5 100644
--- a/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/vspace.h
+++ b/libsel4utils/sel4_arch_include/riscv/sel4utils/sel4_arch/vspace.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef SEL4UTILS_SEL4_ARCH_VSPACE_H
 #define SEL4UTILS_SEL4_ARCH_VSPACE_H
 

libsel4utils/src/arch/riscv/arch.c

diff --git a/libsel4utils/src/arch/riscv/arch.c b/libsel4utils/src/arch/riscv/arch.c
index ccb5c2e..1d0c080 100644
--- a/libsel4utils/src/arch/riscv/arch.c
+++ b/libsel4utils/src/arch/riscv/arch.c
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #include <autoconf.h>
 #include <sel4/types.h>

libsel4utils/src/sel4_arch/riscv/arch.c

diff --git a/libsel4utils/src/sel4_arch/riscv/arch.c b/libsel4utils/src/sel4_arch/riscv/arch.c
index de8c3c2..8ac7722 100644
--- a/libsel4utils/src/sel4_arch/riscv/arch.c
+++ b/libsel4utils/src/sel4_arch/riscv/arch.c
@@ -1,11 +1,13 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #include <autoconf.h>
 #include <sel4/types.h>

libsel4vka/arch_include/riscv/vka/arch/kobject_t.h

diff --git a/libsel4vka/arch_include/riscv/vka/arch/kobject_t.h b/libsel4vka/arch_include/riscv/vka/arch/kobject_t.h
index 2e4a5f2..acd3114 100644
--- a/libsel4vka/arch_include/riscv/vka/arch/kobject_t.h
+++ b/libsel4vka/arch_include/riscv/vka/arch/kobject_t.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _ARCH_KOBJECT_T_H_
 #define _ARCH_KOBJECT_T_H_
 

libsel4vka/arch_include/riscv/vka/arch/object.h

diff --git a/libsel4vka/arch_include/riscv/vka/arch/object.h b/libsel4vka/arch_include/riscv/vka/arch/object.h
index e8ae0b3..06d717b 100644
--- a/libsel4vka/arch_include/riscv/vka/arch/object.h
+++ b/libsel4vka/arch_include/riscv/vka/arch/object.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _VKA_ARCH_OBJECT_H__
 #define _VKA_ARCH_OBJECT_H__
 

libsel4vka/arch_include/riscv32/vka/arch/kobject_t.h

diff --git a/libsel4vka/arch_include/riscv32/vka/arch/kobject_t.h b/libsel4vka/arch_include/riscv32/vka/arch/kobject_t.h
index 2e4a5f2..acd3114 100644
--- a/libsel4vka/arch_include/riscv32/vka/arch/kobject_t.h
+++ b/libsel4vka/arch_include/riscv32/vka/arch/kobject_t.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _ARCH_KOBJECT_T_H_
 #define _ARCH_KOBJECT_T_H_
 

libsel4vka/arch_include/riscv32/vka/arch/object.h

diff --git a/libsel4vka/arch_include/riscv32/vka/arch/object.h b/libsel4vka/arch_include/riscv32/vka/arch/object.h
index e8ae0b3..06d717b 100644
--- a/libsel4vka/arch_include/riscv32/vka/arch/object.h
+++ b/libsel4vka/arch_include/riscv32/vka/arch/object.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _VKA_ARCH_OBJECT_H__
 #define _VKA_ARCH_OBJECT_H__
 

libsel4vka/arch_include/riscv64/vka/arch/kobject_t.h

diff --git a/libsel4vka/arch_include/riscv64/vka/arch/kobject_t.h b/libsel4vka/arch_include/riscv64/vka/arch/kobject_t.h
index 2e4a5f2..acd3114 100644
--- a/libsel4vka/arch_include/riscv64/vka/arch/kobject_t.h
+++ b/libsel4vka/arch_include/riscv64/vka/arch/kobject_t.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _ARCH_KOBJECT_T_H_
 #define _ARCH_KOBJECT_T_H_
 

libsel4vka/arch_include/riscv64/vka/arch/object.h

diff --git a/libsel4vka/arch_include/riscv64/vka/arch/object.h b/libsel4vka/arch_include/riscv64/vka/arch/object.h
index e8ae0b3..06d717b 100644
--- a/libsel4vka/arch_include/riscv64/vka/arch/object.h
+++ b/libsel4vka/arch_include/riscv64/vka/arch/object.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _VKA_ARCH_OBJECT_H__
 #define _VKA_ARCH_OBJECT_H__
 

libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/kobject_t.h

diff --git a/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/kobject_t.h b/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/kobject_t.h
index 6432ab7..2f35eeb 100644
--- a/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/kobject_t.h
+++ b/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/kobject_t.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _SEL4_ARCH_KOBJECT_T_H_
 #define _SEL4_ARCH_KOBJECT_T_H_
 

libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/object.h

diff --git a/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/object.h b/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/object.h
index f8610be..f7613d0 100644
--- a/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/object.h
+++ b/libsel4vka/sel4_arch_include/riscv/vka/sel4_arch/object.h
@@ -1,13 +1,14 @@
 /*
- * Copyright 2014, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
-
 #ifndef _VKA_SEL4_ARCH_OBJECT_H__
 #define _VKA_SEL4_ARCH_OBJECT_H__
 

libsel4vspace/arch_include/riscv/vspace/arch/page.h

diff --git a/libsel4vspace/arch_include/riscv/vspace/arch/page.h b/libsel4vspace/arch_include/riscv/vspace/arch/page.h
index 19915fa..a8da885 100644
--- a/libsel4vspace/arch_include/riscv/vspace/arch/page.h
+++ b/libsel4vspace/arch_include/riscv/vspace/arch/page.h
@@ -1,11 +1,13 @@
 /*
- * Copyright 2016, NICTA
+ * Copyright 2018, Data61
+ * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
+ * ABN 41 687 119 230.
  *
  * This software may be distributed and modified according to the terms of
  * the BSD 2-Clause license. Note that NO WARRANTY is provided.
  * See "LICENSE_BSD2.txt" for details.
  *
- * @TAG(NICTA_BSD)
+ * @TAG(DATA61_BSD)
  */
 #ifndef _VSPACE_ARCH_PAGE_H
 #define _VSPACE_ARCH_PAGE_H