From 6a76857f5f21b7bad5e8802aa98ffe8f03bce3f3 Mon Sep 17 00:00:00 2001
From: Ulrich Mohr <mohr@irs.uni-stuttgart.de>
Date: Mon, 3 Jul 2023 10:09:47 +0200
Subject: [PATCH] clearer wording

---
 src/fsfw/action/TemplateAction.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/fsfw/action/TemplateAction.h b/src/fsfw/action/TemplateAction.h
index 372277e18..ace76122c 100644
--- a/src/fsfw/action/TemplateAction.h
+++ b/src/fsfw/action/TemplateAction.h
@@ -3,11 +3,11 @@
 #include "Action.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 
-template <class owner, class action, class ActionEnum>
+template <class owner_class, class action_type, class ActionEnum>
 class TemplateAction : public Action {
  public:
 #ifdef FSFW_INTROSPECTION
-  TemplateAction(owner *myOwner, ActionEnum id) : Action(), myOwner(myOwner) {
+  TemplateAction(owner_class *myOwner, ActionEnum id) : Action(), myOwner(myOwner) {
     Action::setEnum(&id);
     if (myOwner->getActionHelper() == nullptr) {
       sif::error
@@ -17,13 +17,13 @@ class TemplateAction : public Action {
     myOwner->getActionHelper()->registerAction(this);
   }
 #else
-  TemplateAction(owner *myOwner, ActionEnum id) : Action((uint32_t)id), myOwner(myOwner) {
+  TemplateAction(owner_class *myOwner, ActionEnum id) : Action((uint32_t)id), myOwner(myOwner) {
     myOwner->getActionHelper()->registerAction(this);
   }
 #endif
 
-  ReturnValue_t handle() override { return myOwner->handleAction(dynamic_cast<action *>(this)); }
+  ReturnValue_t handle() override { return myOwner->handleAction(dynamic_cast<action_type *>(this)); }
 
  private:
-  owner *myOwner;
+  owner_class *myOwner;
 };