diff --git a/owlps-positioning/src/accesspointsreadercsv.cc b/owlps-positioning/src/accesspointsreadercsv.cc
index 858b9a3..93ccb07 100644
--- a/owlps-positioning/src/accesspointsreadercsv.cc
+++ b/owlps-positioning/src/accesspointsreadercsv.cc
@@ -13,7 +13,7 @@ using namespace std ;
 AccessPointsReaderCSV::AccessPointsReaderCSV(const string &file_name):
   file(file_name)
 {
-  read_access_points() ;
+  read_devices() ;
 }
 
 
@@ -21,14 +21,14 @@ AccessPointsReaderCSV::AccessPointsReaderCSV(const string &file_name):
 /* *** Operations *** */
 
 
-void AccessPointsReaderCSV::read_access_points()
+void AccessPointsReaderCSV::read_devices()
 {
   while (file.next_line())
-    process_access_point_line() ;
+    process_device_line() ;
 }
 
 
-void AccessPointsReaderCSV::process_access_point_line()
+void AccessPointsReaderCSV::process_device_line()
 {
   string mac ;
   if (! file.read_field(mac))
@@ -53,6 +53,6 @@ void AccessPointsReaderCSV::process_access_point_line()
 
   string ip("") ;
 
-  AccessPoint ap(coord, ip, mac, gain, power, frequency) ;
-  Stock::find_create_ap(ap) ;
+  AccessPoint device(coord, ip, mac, gain, power, frequency) ;
+  Stock::find_create_ap(device) ;
 }
diff --git a/owlps-positioning/src/accesspointsreadercsv.hh b/owlps-positioning/src/accesspointsreadercsv.hh
index 97d8191..a81b7a4 100644
--- a/owlps-positioning/src/accesspointsreadercsv.hh
+++ b/owlps-positioning/src/accesspointsreadercsv.hh
@@ -17,8 +17,8 @@ class AccessPointsReaderCSV
 protected:
   CSVFileReader file ;
 
-  void read_access_points(void) ;
-  void process_access_point_line(void) ;
+  void read_devices(void) ;
+  void process_device_line(void) ;
 
 public:
   AccessPointsReaderCSV(const std::string &file_name) ;