diff --git a/test/f90_correct/src/oop391.f90 b/test/f90_correct/src/oop391.f90
index ecd33084fa1..3e2bfd1426b 100644
--- a/test/f90_correct/src/oop391.f90
+++ b/test/f90_correct/src/oop391.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
+integer,kind :: k22 = 2
+integer,kind :: k11
 integer :: st
 integer p
 integer(k22) :: i
-integer,kind :: k22 = 2
-integer,kind :: k11
 end type
 
 contains
diff --git a/test/f90_correct/src/oop392.f90 b/test/f90_correct/src/oop392.f90
index 9201a555f3e..e233394b815 100644
--- a/test/f90_correct/src/oop392.f90
+++ b/test/f90_correct/src/oop392.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,11 +21,11 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
+integer,kind :: k22 = 2
+integer,kind :: k11 = 3
 integer :: st
 integer p
 integer(k22) :: i
-integer,kind :: k22 = 2 
-integer,kind :: k11 = 3
 end type
 
 contains
diff --git a/test/f90_correct/src/oop393.f90 b/test/f90_correct/src/oop393.f90
index 3d761e013ee..175bae90e2a 100644
--- a/test/f90_correct/src/oop393.f90
+++ b/test/f90_correct/src/oop393.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i 
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop394.f90 b/test/f90_correct/src/oop394.f90
index a5c219b04ac..529ca722a17 100644
--- a/test/f90_correct/src/oop394.f90
+++ b/test/f90_correct/src/oop394.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 logical expect(3),rslt(3)
 type :: stuff(k11,k22)
-integer(k22) :: i
 integer,kind :: k22 = 2 
 integer,kind :: k11
+integer(k22) :: i
 end type
 
 end module
diff --git a/test/f90_correct/src/oop395.f90 b/test/f90_correct/src/oop395.f90
index 76402a7c999..ca885ddbaa5 100644
--- a/test/f90_correct/src/oop395.f90
+++ b/test/f90_correct/src/oop395.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 logical expect(2),rslt(2)
 type :: stuff(k11,k22)
-integer(k22) :: i
 integer,kind :: k22 = 2
 integer,kind :: k11
+integer(k22) :: i
 end type
 type :: stuff2
 integer :: i
diff --git a/test/f90_correct/src/oop402.f90 b/test/f90_correct/src/oop402.f90
index 3d761e013ee..f0660948c16 100644
--- a/test/f90_correct/src/oop402.f90
+++ b/test/f90_correct/src/oop402.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop403.f90 b/test/f90_correct/src/oop403.f90
index c2a42bc09e1..6461be062e9 100644
--- a/test/f90_correct/src/oop403.f90
+++ b/test/f90_correct/src/oop403.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i 
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop404.f90 b/test/f90_correct/src/oop404.f90
index 12ca0115c1d..5ad4a4918aa 100644
--- a/test/f90_correct/src/oop404.f90
+++ b/test/f90_correct/src/oop404.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i 
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop405.f90 b/test/f90_correct/src/oop405.f90
index 224f660d41c..7828dfff145 100644
--- a/test/f90_correct/src/oop405.f90
+++ b/test/f90_correct/src/oop405.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i 
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop407.f90 b/test/f90_correct/src/oop407.f90
index fa662305bc0..b165e115760 100644
--- a/test/f90_correct/src/oop407.f90
+++ b/test/f90_correct/src/oop407.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -22,10 +22,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i 
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop427.f90 b/test/f90_correct/src/oop427.f90
index c594a29224a..fa6ab98512e 100644
--- a/test/f90_correct/src/oop427.f90
+++ b/test/f90_correct/src/oop427.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@ module mod
 end type
 
 type,extends(objects) :: stuff(k11,k22)
-integer :: st
-integer(k1) :: i 
 integer,kind :: k22 = selected_real_kind(1)
 integer,kind :: k11 = 3
+integer :: st
+integer(k1) :: i
 character(kind=k2) :: c
 real(k22) :: j
 integer d
diff --git a/test/f90_correct/src/oop433.f90 b/test/f90_correct/src/oop433.f90
index ab405b76bdc..32141fb9e56 100644
--- a/test/f90_correct/src/oop433.f90
+++ b/test/f90_correct/src/oop433.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 program p
 implicit none
 type :: objects(l1)
-character(len=l1) :: c
 integer, len :: l1 = 10
+character(len=l1) :: c
 integer  p(l1)
 end type
 
diff --git a/test/f90_correct/src/oop434.f90 b/test/f90_correct/src/oop434.f90
index 4ac821a449f..bce71fe76d4 100644
--- a/test/f90_correct/src/oop434.f90
+++ b/test/f90_correct/src/oop434.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ program p
 implicit none
 logical rslt(2),expect(2)
 type :: objects(l1)
-character(len=l1) :: c
 integer, len :: l1 = 10
+character(len=l1) :: c
 end type
 
 
diff --git a/test/f90_correct/src/oop435.f90 b/test/f90_correct/src/oop435.f90
index c17b522844f..34039434f9e 100644
--- a/test/f90_correct/src/oop435.f90
+++ b/test/f90_correct/src/oop435.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ program p
 implicit none
 logical rslt(2),expect(2)
 type :: objects(l1)
-character(len=l1) :: c
 integer, kind :: l1 = 10
+character(len=l1) :: c
 end type
 
 
diff --git a/test/f90_correct/src/oop438.f90 b/test/f90_correct/src/oop438.f90
index 33a5aa2ac5a..86ac97d7a30 100644
--- a/test/f90_correct/src/oop438.f90
+++ b/test/f90_correct/src/oop438.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 implicit none
 type :: objects(l1)
+integer, kind :: l1 = 10
 character(len=l1) :: c
 integer p(l1)
-integer, kind :: l1 = 10
 end type
 end module
 
diff --git a/test/f90_correct/src/oop439.f90 b/test/f90_correct/src/oop439.f90
index df73461f71c..e8b1c25d6d0 100644
--- a/test/f90_correct/src/oop439.f90
+++ b/test/f90_correct/src/oop439.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 implicit none
 type :: objects(l1)
+integer, len :: l1 = 10
 character(len=l1) :: c
 integer :: p(l1)
-integer, len :: l1 = 10
 end type
 end module
 
diff --git a/test/f90_correct/src/oop440.f90 b/test/f90_correct/src/oop440.f90
index 396766c79c3..e2f62c5d124 100644
--- a/test/f90_correct/src/oop440.f90
+++ b/test/f90_correct/src/oop440.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 implicit none
 type :: objects(l1)
+integer, len :: l1 = 10
 character(len=l1) :: c
 integer :: p(l1)
-integer, len :: l1 = 10
 end type
 end module
 
diff --git a/test/f90_correct/src/oop443.f90 b/test/f90_correct/src/oop443.f90
index 665cfb3af1c..5a01068a5d1 100644
--- a/test/f90_correct/src/oop443.f90
+++ b/test/f90_correct/src/oop443.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ module mod
 logical expect(12),rslt(12)
 
 type :: objects(k1,l1)
-integer:: p(l1)
 integer, len :: l1 = 10
 integer, kind:: k1=selected_int_kind(2)
+integer:: p(l1)
 character(len=l1) :: c
 integer(k1):: d
 end type
diff --git a/test/f90_correct/src/oop444.f90 b/test/f90_correct/src/oop444.f90
index 359ca4133ad..fbe40a9c2b4 100644
--- a/test/f90_correct/src/oop444.f90
+++ b/test/f90_correct/src/oop444.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@ module mod
 logical expect(12),rslt(12)
 
 type :: objects(k1,l1)
-integer:: p(l1)
 integer, kind:: k1=selected_int_kind(2)
+integer, len :: l1 = 10
+integer:: p(l1)
 character(len=l1) :: c
 integer(k1):: d
-integer, len :: l1 = 10
 end type
 contains
 subroutine foo(x,n)
diff --git a/test/f90_correct/src/oop447.f90 b/test/f90_correct/src/oop447.f90
index afbbf62c510..3e3138f760a 100644
--- a/test/f90_correct/src/oop447.f90
+++ b/test/f90_correct/src/oop447.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 logical expect(8),rslt(8)
 type :: stuff(k11,k22)
-integer(k22) :: i
 integer,kind :: k22 = 2
 integer,kind :: k11 = 4
+integer(k22) :: i
 integer(k22) :: j
 end type
 end module
diff --git a/test/f90_correct/src/oop449.f90 b/test/f90_correct/src/oop449.f90
index 1b648e20190..2299dd9ab0f 100644
--- a/test/f90_correct/src/oop449.f90
+++ b/test/f90_correct/src/oop449.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 module mod
 logical expect(12),rslt(12)
 type :: stuff(k11,k22)
-integer(k11) :: i = 3
 integer,len :: k22 = 20
 integer,kind :: k11 = 4
+integer(k11) :: i = 3
 integer(k11) :: j=4
 integer :: p(k22)
 end type
diff --git a/test/f90_correct/src/oop468.f90 b/test/f90_correct/src/oop468.f90
index 85ddf94fa0f..2b08b46642a 100644
--- a/test/f90_correct/src/oop468.f90
+++ b/test/f90_correct/src/oop468.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ module mod
 type :: objects(k1,k2,l1)
 integer, kind :: k1 = 3
 integer, kind :: k2 = selected_char_kind("ASCII")
-character(kind=k2,len=l1) :: c
 integer, len :: l1
+character(kind=k2,len=l1) :: c
 integer  :: a(1+l1)
 !integer   a(1+l1)
 end type
diff --git a/test/f90_correct/src/oop469.f90 b/test/f90_correct/src/oop469.f90
index 9e73468aeff..038e2c59b22 100644
--- a/test/f90_correct/src/oop469.f90
+++ b/test/f90_correct/src/oop469.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ module mod
 type :: objects(k1,k2,l1)
 integer, kind :: k1 = 3
 integer, kind :: k2 = selected_char_kind("ASCII")
-character(kind=k2,len=l1) :: c
 integer, len :: l1
+character(kind=k2,len=l1) :: c
 integer  :: a(1+l1)
 !integer   a(1+l1)
 end type
diff --git a/test/f90_correct/src/oop470.f90 b/test/f90_correct/src/oop470.f90
index d084ba45535..7fe8b68ab96 100644
--- a/test/f90_correct/src/oop470.f90
+++ b/test/f90_correct/src/oop470.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ module mod
 type :: objects(k1,k2,l1)
 integer, kind :: k1 = 3
 integer, kind :: k2 = selected_char_kind("ASCII")
-character(kind=k2,len=l1) :: c
 integer, len :: l1
+character(kind=k2,len=l1) :: c
 integer   a(l1+1)
 !integer   a(1+l1)
 end type
diff --git a/test/f90_correct/src/oop471.f90 b/test/f90_correct/src/oop471.f90
index c467b562980..5a737ed1bd4 100644
--- a/test/f90_correct/src/oop471.f90
+++ b/test/f90_correct/src/oop471.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,8 +17,8 @@ module mod
 logical expect(6), rslt(6)
 type :: objects(l1,k1)
 integer, kind :: k1 = selected_char_kind("ASCII")
-character(kind=k1,len=l1) :: c
 integer, len :: l1
+character(kind=k1,len=l1) :: c
 end type
 contains
 integer function check_dt(xx)
diff --git a/test/f90_correct/src/oop472.f90 b/test/f90_correct/src/oop472.f90
index 03598ee5912..69b97b071d8 100644
--- a/test/f90_correct/src/oop472.f90
+++ b/test/f90_correct/src/oop472.f90
@@ -1,4 +1,4 @@
-! Copyright (c) 2012, NVIDIA CORPORATION.  All rights reserved.
+! Copyright (c) 2012-2017, NVIDIA CORPORATION.  All rights reserved.
 !
 ! Licensed under the Apache License, Version 2.0 (the "License");
 ! you may not use this file except in compliance with the License.
@@ -17,9 +17,9 @@ module mod
 logical expect(16), rslt(16)
 type :: objects(k1,l1)
 integer, kind :: k1 = selected_char_kind("ASCII")
+integer, len :: l1
 character(len=l1) :: c
 character(len=l1) :: c2
-integer, len :: l1
 integer z 
 end type
 contains