diff --git a/include/task/task_t.hpp b/include/explorer/explorer_t.hpp
similarity index 97%
rename from include/task/task_t.hpp
rename to include/explorer/explorer_t.hpp
index d0195f5..0c28a61 100644
--- a/include/task/task_t.hpp
+++ b/include/explorer/explorer_t.hpp
@@ -9,7 +9,7 @@
 
 namespace ingress_drone_explorer {
 
-class task_t {
+class explorer_t {
 public:
     void load_portals(const std::vector<std::string>& filenames);
     void load_keys(const std::string& filename);
diff --git a/src/command.cpp b/src/command.cpp
index 5d67ed4..5d17244 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -5,7 +5,7 @@
 #include <boost/program_options.hpp>
 
 #include "extensions/iostream_extensions.hpp"
-#include "task/task_t.hpp"
+#include "explorer/explorer_t.hpp"
 
 namespace ingress_drone_explorer {
 
@@ -46,15 +46,15 @@ void command::execute(const int argc, const char* const argv[]) {
 
     boost::program_options::notify(variables);
 
-    task_t task;
-    task.load_portals(portal_list_filenames);
+    explorer_t explorer;
+    explorer.load_portals(portal_list_filenames);
     if (variables.count("key-list")) {
-        task.load_keys(variables["key-list"].as<std::string>());
+        explorer.load_keys(variables["key-list"].as<std::string>());
     }
-    task.explore_from(start);
-    task.report();
+    explorer.explore_from(start);
+    explorer.report();
     if (variables.count("output-drawn-items")) {
-        task.save_drawn_items_to(variables["output-drawn-items"].as<std::string>());
+        explorer.save_drawn_items_to(variables["output-drawn-items"].as<std::string>());
     }
 }
 
diff --git a/src/task/explore.cpp b/src/explorer/explore.cpp
similarity index 97%
rename from src/task/explore.cpp
rename to src/explorer/explore.cpp
index 2fcc353..1dcab7c 100644
--- a/src/task/explore.cpp
+++ b/src/explorer/explore.cpp
@@ -1,4 +1,4 @@
-#include "task/task_t.hpp"
+#include "explorer/explorer_t.hpp"
 
 #include <chrono>
 #include <iomanip>
@@ -8,7 +8,7 @@
 
 namespace ingress_drone_explorer {
 
-void task_t::explore_from(const coordinate_t& start) {
+void explorer_t::explore_from(const coordinate_t& start) {
     _start = start;
     const auto start_time = std::chrono::steady_clock::now();
     const auto start_cell = s2::cell_t(start);
diff --git a/src/task/load.cpp b/src/explorer/load.cpp
similarity index 96%
rename from src/task/load.cpp
rename to src/explorer/load.cpp
index 1dee8f3..51f1d6a 100644
--- a/src/task/load.cpp
+++ b/src/explorer/load.cpp
@@ -1,4 +1,4 @@
-#include "task/task_t.hpp"
+#include "explorer/explorer_t.hpp"
 
 #include <chrono>
 #include <filesystem>
@@ -12,7 +12,7 @@
 
 namespace ingress_drone_explorer {
 
-void task_t::load_portals(const std::vector<std::string>& filenames) {
+void explorer_t::load_portals(const std::vector<std::string>& filenames) {
     const auto start_time = std::chrono::steady_clock::now();
     std::cout << "⏳ Loading Portals..." << std::endl;
 
@@ -93,7 +93,7 @@ void task_t::load_portals(const std::vector<std::string>& filenames) {
         << std::endl;
 }
 
-void task_t::load_keys(const std::string& filename) {
+void explorer_t::load_keys(const std::string& filename) {
     std::cout << "⏳ Loading Keys from " << filename << "..." << std::endl;
     std::ifstream in(filename);
     if (!in.is_open()) {
diff --git a/src/task/report.cpp b/src/explorer/report.cpp
similarity index 91%
rename from src/task/report.cpp
rename to src/explorer/report.cpp
index 4cdd26d..f06ce6c 100644
--- a/src/task/report.cpp
+++ b/src/explorer/report.cpp
@@ -1,4 +1,4 @@
-#include "task/task_t.hpp"
+#include "explorer/explorer_t.hpp"
 
 #include <fstream>
 #include <iomanip>
@@ -12,7 +12,7 @@
 
 namespace ingress_drone_explorer {
 
-void task_t::report() const {
+void explorer_t::report() const {
     size_t portals_count = 0;
     size_t reachable_portals_count = 0;
     portal_t furthest_portal;
@@ -38,12 +38,12 @@ void task_t::report() const {
             << std::endl;
         return;
     }
-    const auto total_numberDigits = digits(portals_count);
+    const auto total_number_digits = digits(portals_count);
     const auto reachable_number_digits = digits(reachable_portals_count);
     const auto unreachable_number_digits = digits(portals_count - reachable_portals_count);
     std::cout
         << "⬜️ In "
-        << std::setw(total_numberDigits) << _cells.size()
+        << std::setw(total_number_digits) << _cells.size()
         << "   cell(s), "
         << std::setw(reachable_number_digits) << _reachable_cells.size()
         << " are ✅ reachable, "
@@ -52,7 +52,7 @@ void task_t::report() const {
         << std::endl;
     std::cout
         << "📍 In "
-        << std::setw(total_numberDigits) << portals_count
+        << std::setw(total_number_digits) << portals_count
         << " Portal(s), "
         << std::setw(reachable_number_digits) << reachable_portals_count
         << " are ✅ reachable, "
@@ -72,7 +72,7 @@ void task_t::report() const {
             << std::endl;
 }
 
-void task_t::save_drawn_items_to(const std::string& filename) const {
+void explorer_t::save_drawn_items_to(const std::string& filename) const {
     std::ofstream out(filename);
     if (!out.is_open()) {
         throw std::runtime_error("Unable to open drawn items file.");