diff --git a/gl/gloffscreen_glx.c b/gl/gloffscreen_glx.c
index 3a0e608164..1b9bad47bd 100644
--- a/gl/gloffscreen_glx.c
+++ b/gl/gloffscreen_glx.c
@@ -2,7 +2,7 @@
  *  Offscreen OpenGL abstraction layer - GLX (X11) specific
  *
  *  Copyright (c) 2013 Wayo
- *  Copyright (c) 2014 JayFoxRox
+ *  Copyright (c) 2014 Jannik Vogel
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c
index 7d5dbba1e4..6f3f4c0434 100644
--- a/hw/xbox/nv2a.c
+++ b/hw/xbox/nv2a.c
@@ -2,7 +2,7 @@
  * QEMU Geforce NV2A implementation
  *
  * Copyright (c) 2012 espes
- * Copyright (c) 2015 JayFoxRox
+ * Copyright (c) 2015 Jannik Vogel
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/hw/xbox/nv2a_psh.c b/hw/xbox/nv2a_psh.c
index 34047124c8..1badf94287 100644
--- a/hw/xbox/nv2a_psh.c
+++ b/hw/xbox/nv2a_psh.c
@@ -2,6 +2,7 @@
  * QEMU Geforce NV2A pixel shader translation
  *
  * Copyright (c) 2013 espes
+ * Copyright (c) 2015 Jannik Vogel
  *
  * Based on:
  * Cxbx, PixelShader.cpp
diff --git a/hw/xbox/nv2a_shaders.c b/hw/xbox/nv2a_shaders.c
index 73bedbe747..7e5495b158 100644
--- a/hw/xbox/nv2a_shaders.c
+++ b/hw/xbox/nv2a_shaders.c
@@ -2,7 +2,7 @@
  * QEMU Geforce NV2A shader generator
  *
  * Copyright (c) 2015 espes
- * Copyright (c) 2015 JayFoxRox
+ * Copyright (c) 2015 Jannik Vogel
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/hw/xbox/nv2a_shaders.h b/hw/xbox/nv2a_shaders.h
index ef76165df9..54d40fb4cc 100644
--- a/hw/xbox/nv2a_shaders.h
+++ b/hw/xbox/nv2a_shaders.h
@@ -2,7 +2,7 @@
  * QEMU Geforce NV2A shader generator
  *
  * Copyright (c) 2015 espes
- * Copyright (c) 2015 JayFoxRox
+ * Copyright (c) 2015 Jannik Vogel
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
diff --git a/hw/xbox/nv2a_shaders_common.h b/hw/xbox/nv2a_shaders_common.h
index 384eb6bf2b..19e0f88067 100644
--- a/hw/xbox/nv2a_shaders_common.h
+++ b/hw/xbox/nv2a_shaders_common.h
@@ -2,7 +2,7 @@
  * QEMU Geforce NV2A shader common definitions
  *
  * Copyright (c) 2015 espes
- * Copyright (c) 2015 JayFoxRox
+ * Copyright (c) 2015 Jannik Vogel
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -34,4 +34,4 @@
                            "  vec4 T3;\n" \
                            "};\n"
 
-#endif
\ No newline at end of file
+#endif
diff --git a/hw/xbox/swizzle.c b/hw/xbox/swizzle.c
index b5700ba355..b3180d95f7 100644
--- a/hw/xbox/swizzle.c
+++ b/hw/xbox/swizzle.c
@@ -1,6 +1,7 @@
 /*
  * QEMU texture swizzling routines
  *
+ * Copyright (c) 2015 Jannik Vogel
  * Copyright (c) 2013 espes
  * Copyright (c) 2007-2010 The Nouveau Project.
  *
diff --git a/hw/xbox/swizzle.h b/hw/xbox/swizzle.h
index fa64b9a87d..14528a4865 100644
--- a/hw/xbox/swizzle.h
+++ b/hw/xbox/swizzle.h
@@ -1,6 +1,7 @@
 /*
  * QEMU texture swizzling routines
  *
+ * Copyright (c) 2015 Jannik Vogel
  * Copyright (c) 2013 espes
  *
  * This library is free software; you can redistribute it and/or