diff --git a/include/aidge/backend/StimulusImpl.hpp b/include/aidge/backend/StimulusImpl.hpp
index e875f993278b496b9acefd6c28a4c17d0a32a8b7..fbdf57b1587d76160c0cb146b6fe9da6947541dc 100644
--- a/include/aidge/backend/StimulusImpl.hpp
+++ b/include/aidge/backend/StimulusImpl.hpp
@@ -9,8 +9,8 @@
  *
  ********************************************************************************/
 
-#ifndef AIDGE_CORE_BACKEND_STIMULIIMPL_H_
-#define AIDGE_CORE_BACKEND_STIMULIIMPL_H_
+#ifndef AIDGE_CORE_BACKEND_STIMULUSIMPL_H_
+#define AIDGE_CORE_BACKEND_STIMULUSIMPL_H_
 
 #include <memory>
 
@@ -25,8 +25,8 @@ class StimulusImpl {
 public:
     virtual ~StimulusImpl() noexcept = default;
 
-    virtual std::shared_ptr<Tensor> load() = 0;
+    virtual std::shared_ptr<Tensor> load() const = 0;
 };
 } // namespace Aidge
 
-#endif /* AIDGE_CORE_BACKEND_STIMULIIMPL_H_ */
+#endif /* AIDGE_CORE_BACKEND_STIMULUSIMPL_H_ */
diff --git a/include/aidge/stimuli/Stimulus.hpp b/include/aidge/stimuli/Stimulus.hpp
index cc12f8844e72f2967decb68c4164b5cc7cb01a0c..80e7c76d4857f577f30b90588f4c3998be80bdb8 100644
--- a/include/aidge/stimuli/Stimulus.hpp
+++ b/include/aidge/stimuli/Stimulus.hpp
@@ -9,8 +9,8 @@
  *
  ********************************************************************************/
 
-#ifndef AIDGE_CORE_STIMULI_STIMULI_H_
-#define AIDGE_CORE_STIMULI_STIMULI_H_
+#ifndef AIDGE_CORE_STIMULI_STIMULUS_H_
+#define AIDGE_CORE_STIMULI_STIMULUS_H_
 
 #include <string>
 #include <memory>
@@ -104,4 +104,4 @@ public:
 };
 } // namespace Aidge
 
-#endif // STIMULI_H
+#endif // AIDGE_CORE_STIMULI_STIMULUS_H_
diff --git a/src/stimuli/Stimuli.cpp b/src/stimuli/Stimulus.cpp
similarity index 100%
rename from src/stimuli/Stimuli.cpp
rename to src/stimuli/Stimulus.cpp