diff --git a/src/Navaids/Makefile.am b/src/Navaids/Makefile.am
index 58b602bac..f5229c05c 100644
--- a/src/Navaids/Makefile.am
+++ b/src/Navaids/Makefile.am
@@ -2,7 +2,7 @@ noinst_LIBRARIES = libNavAids.a
 
 noinst_PROGRAMS = testnavs
 
-libNavAids_a_SOURCES = navaid.hxx navaids.hxx navaids.cxx
+libNavAids_a_SOURCES = nav.hxx navlist.hxx navlist.cxx
 
 testnavs_SOURCES = testnavs.cxx
 testnavs_LDADD = libNavAids.a -lsgdebug -lsgmath -lsgmisc -lz
diff --git a/src/Navaids/navaid.hxx b/src/Navaids/nav.hxx
similarity index 100%
rename from src/Navaids/navaid.hxx
rename to src/Navaids/nav.hxx
diff --git a/src/Navaids/navaids.cxx b/src/Navaids/navlist.cxx
similarity index 99%
rename from src/Navaids/navaids.cxx
rename to src/Navaids/navlist.cxx
index e67b52c69..a23bef3a5 100644
--- a/src/Navaids/navaids.cxx
+++ b/src/Navaids/navlist.cxx
@@ -25,7 +25,7 @@
 #include <simgear/misc/fgstream.hxx>
 #include <simgear/math/fg_geodesy.hxx>
 
-#include "navaids.hxx"
+#include "navlist.hxx"
 
 
 // Constructor
diff --git a/src/Navaids/navaids.hxx b/src/Navaids/navlist.hxx
similarity index 98%
rename from src/Navaids/navaids.hxx
rename to src/Navaids/navlist.hxx
index f537ce66d..85312ef8e 100644
--- a/src/Navaids/navaids.hxx
+++ b/src/Navaids/navlist.hxx
@@ -31,7 +31,7 @@
 #include <map>
 #include <vector>
 
-#include "navaid.hxx"
+#include "nav.hxx"
 
 FG_USING_STD(map);
 FG_USING_STD(vector);
diff --git a/src/Navaids/testnavs.cxx b/src/Navaids/testnavs.cxx
index f988f5312..59a5c678c 100644
--- a/src/Navaids/testnavs.cxx
+++ b/src/Navaids/testnavs.cxx
@@ -1,6 +1,6 @@
 #include <simgear/misc/fgpath.hxx>
 
-#include "navaids.hxx"
+#include "navlist.hxx"
 
 int main() {
     FGNavaids navs;