diff --git a/eeschema/lib_collectors.cpp b/eeschema/lib_collectors.cpp
index 190eb4cf58..612cfb0dde 100644
--- a/eeschema/lib_collectors.cpp
+++ b/eeschema/lib_collectors.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2011 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/eeschema/lib_collectors.h b/eeschema/lib_collectors.h
index 4bea55f265..57ce5a09c6 100644
--- a/eeschema/lib_collectors.h
+++ b/eeschema/lib_collectors.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2011 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -26,7 +26,7 @@
 #define _LIB_COLLECTORS_H_
 
 
-#include <class_collector.h>
+#include <collector.h>
 #include <class_libentry.h>
 
 class LIB_COLLECTOR;
diff --git a/eeschema/sch_collectors.cpp b/eeschema/sch_collectors.cpp
index 67b814a340..db9fa3a8b2 100644
--- a/eeschema/sch_collectors.cpp
+++ b/eeschema/sch_collectors.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011-2016 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2004-2016 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2016 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/eeschema/sch_collectors.h b/eeschema/sch_collectors.h
index ee57ceafe7..5e8d358dda 100644
--- a/eeschema/sch_collectors.h
+++ b/eeschema/sch_collectors.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
- * Copyright (C) 2011-2015 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2011-2015 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,7 +30,7 @@
 #define _SCH_COLLECTORS_H_
 
 
-#include <class_collector.h>
+#include <collector.h>
 #include <sch_item_struct.h>
 #include <dialogs/dialog_schematic_find.h>
 
diff --git a/gerbview/gerber_collectors.h b/gerbview/gerber_collectors.h
index 64714a9b70..53e2cbe024 100644
--- a/gerbview/gerber_collectors.h
+++ b/gerbview/gerber_collectors.h
@@ -20,7 +20,7 @@
 #ifndef GERBER_COLLECTORS_H
 #define GERBER_COLLECTORS_H
 
-#include <class_collector.h>
+#include <collector.h>
 
 /**
  * Class GERBER_COLLECTOR
diff --git a/include/class_collector.h b/include/collector.h
similarity index 99%
rename from include/class_collector.h
rename to include/collector.h
index 537c08a42e..07531aec7c 100644
--- a/include/class_collector.h
+++ b/include/collector.h
@@ -23,7 +23,7 @@
  */
 
 /**
- * @file class_collector.h
+ * @file collector.h
  * @brief COLLECTOR class definition.
  */
 
diff --git a/pcbnew/collectors.cpp b/pcbnew/collectors.cpp
index ba1e509af2..8b3e7d37ab 100644
--- a/pcbnew/collectors.cpp
+++ b/pcbnew/collectors.cpp
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007-2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2017 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
diff --git a/pcbnew/collectors.h b/pcbnew/collectors.h
index 1a75b9a999..1205fb3896 100644
--- a/pcbnew/collectors.h
+++ b/pcbnew/collectors.h
@@ -2,7 +2,7 @@
  * This program source code file is part of KiCad, a free EDA CAD application.
  *
  * Copyright (C) 2007-2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
- * Copyright (C) 2004-2017 KiCad Developers, see change_log.txt for contributors.
+ * Copyright (C) 2004-2018 KiCad Developers, see AUTHORS.txt for contributors.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@
  */
 
 
-#include <class_collector.h>
+#include <collector.h>
 #include <layers_id_colors_and_visibility.h>              // LAYER_COUNT, layer defs