diff --git a/examples/ZydisFuzzIn.c b/examples/ZydisFuzzIn.c
index d4a1334..9759884 100644
--- a/examples/ZydisFuzzIn.c
+++ b/examples/ZydisFuzzIn.c
@@ -1,8 +1,8 @@
 /***************************************************************************************************
 
-  Zyan Disassembler Engine (Zydis)
+  Zyan Disassembler Library (Zydis)
 
-  Original Author : Joel Höner
+  Original Author : Joel Hoener
 
  * 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/examples/ZydisPerfTest.c b/examples/ZydisPerfTest.c
index b9b76f8..cc9d121 100644
--- a/examples/ZydisPerfTest.c
+++ b/examples/ZydisPerfTest.c
@@ -1,6 +1,6 @@
 /***************************************************************************************************
 
-  Zyan Disassembler Engine (Zydis)
+  Zyan Disassembler Library (Zydis)
 
   Original Author : Florian Bernd
 
diff --git a/include/Zydis/CommonTypes.h b/include/Zydis/CommonTypes.h
index 8695d2b..c8235ef 100644
--- a/include/Zydis/CommonTypes.h
+++ b/include/Zydis/CommonTypes.h
@@ -2,7 +2,7 @@
 
   Zyan Disassembler Library (Zydis)
 
-  Original Author : Florian Bernd, Joel Höner
+  Original Author : Florian Bernd, Joel Hoener
 
  * 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/include/Zydis/Internal/LibC.h b/include/Zydis/Internal/LibC.h
index 8fabf87..8f904b6 100644
--- a/include/Zydis/Internal/LibC.h
+++ b/include/Zydis/Internal/LibC.h
@@ -2,7 +2,7 @@
 
   Zyan Disassembler Library (Zydis)
 
-  Original Author : Joel Höner
+  Original Author : Joel Hoener
 
  * 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/include/Zydis/String.h b/include/Zydis/String.h
index 199eea6..2848f62 100644
--- a/include/Zydis/String.h
+++ b/include/Zydis/String.h
@@ -2,7 +2,7 @@
 
   Zyan Disassembler Library (Zydis)
 
-  Original Author : Florian Bernd, Joel Höner
+  Original Author : Florian Bernd, Joel Hoener
 
  * 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/src/Formatter.c b/src/Formatter.c
index 2249ebb..d2156ce 100644
--- a/src/Formatter.c
+++ b/src/Formatter.c
@@ -2,7 +2,7 @@
 
   Zyan Disassembler Library (Zydis)
 
-  Original Author : Florian Bernd, Joel Höner
+  Original Author : Florian Bernd, Joel Hoener
 
  * 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/src/String.c b/src/String.c
index 9d42055..87cb6fd 100644
--- a/src/String.c
+++ b/src/String.c
@@ -2,7 +2,7 @@
 
   Zyan Disassembler Library (Zydis)
 
-  Original Author : Florian Bernd, Joel Höner
+  Original Author : Florian Bernd, Joel Hoener
 
  * 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/tools/ZydisDisasm.c b/tools/ZydisDisasm.c
index 0f8815a..2171738 100644
--- a/tools/ZydisDisasm.c
+++ b/tools/ZydisDisasm.c
@@ -1,8 +1,8 @@
 /***************************************************************************************************
 
-  Zyan Disassembler Engine (Zydis)
+  Zyan Disassembler Library (Zydis)
 
-  Original Author : Florian Bernd, Joel Höner
+  Original Author : Florian Bernd, Joel Hoener
 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal