diff --git a/python/mesa_pd/templates/data/ContactAccessor.templ.h b/python/mesa_pd/templates/data/ContactAccessor.templ.h
index 86666fcc356720ca0f3d9f8d9efc305561b04bef..95c0b50be31b11a6a9819bd8cda5b229a798b58f 100644
--- a/python/mesa_pd/templates/data/ContactAccessor.templ.h
+++ b/python/mesa_pd/templates/data/ContactAccessor.templ.h
@@ -47,7 +47,7 @@ class ContactAccessor : public IContactAccessor
 {
 public:
    ContactAccessor(const std::shared_ptr<data::ContactStorage>& ps) : ps_(ps) {}
-   virtual ~ContactAccessor() = default;
+   ~ContactAccessor() override = default;
 
    {%- for prop in properties %}
    const {{prop.type}}& get{{prop.name | capFirst}}(const size_t p_idx) const {return ps_->get{{prop.name | capFirst}}(p_idx);}
@@ -95,10 +95,10 @@ inline size_t ContactAccessor::find(const id_t& uid)
  *
  * Provides get, set and getRef.
  */
-class SingleContactAccessor : public IAccessor
+class SingleContactAccessor : public IContactAccessor
 {
 public:
-   virtual ~SingleContactAccessor() = default;
+   ~SingleContactAccessor() override = default;
 
    {%- for prop in properties %}
    const {{prop.type}}& get{{prop.name | capFirst}}(const size_t /*p_idx*/) const {return {{prop.name}}_;}
diff --git a/python/mesa_pd/templates/data/ParticleAccessor.templ.h b/python/mesa_pd/templates/data/ParticleAccessor.templ.h
index 701d802d05005c2c02816ef2f7f5818ac28673ba..593528d4c6b0b5f74c91b87cf62bbf42daded75e 100644
--- a/python/mesa_pd/templates/data/ParticleAccessor.templ.h
+++ b/python/mesa_pd/templates/data/ParticleAccessor.templ.h
@@ -47,7 +47,7 @@ class ParticleAccessor : public IAccessor
 {
 public:
    ParticleAccessor(const std::shared_ptr<data::ParticleStorage>& ps) : ps_(ps) {}
-   virtual ~ParticleAccessor() = default;
+   ~ParticleAccessor() override = default;
 
    {%- for prop in properties %}
    {{prop.type}} const & get{{prop.name | capFirst}}(const size_t p_idx) const {return ps_->get{{prop.name | capFirst}}(p_idx);}
@@ -98,7 +98,7 @@ inline size_t ParticleAccessor::find(const id_t& uid)
 class SingleParticleAccessor : public IAccessor
 {
 public:
-   virtual ~SingleParticleAccessor() = default;
+   ~SingleParticleAccessor() override = default;
 
    {%- for prop in properties %}
    {{prop.type}} const & get{{prop.name | capFirst}}(const size_t /*p_idx*/) const {return {{prop.name}}_;}
diff --git a/python/mesa_pd/templates/tests/CheckInterface.templ.cpp b/python/mesa_pd/templates/tests/CheckInterface.templ.cpp
index 817001e2d9be55b5fbca0927231f2bd38b174359..20a52336b49d636eff04f21859700ba504046fd3 100644
--- a/python/mesa_pd/templates/tests/CheckInterface.templ.cpp
+++ b/python/mesa_pd/templates/tests/CheckInterface.templ.cpp
@@ -37,7 +37,7 @@ namespace mesa_pd {
 class Accessor : public data::IAccessor
 {
 public:
-   virtual ~Accessor() = default;
+   ~Accessor() override = default;
 
    {%- for prop in interface %}
    {%- if 'g' in prop.access %}
diff --git a/src/mesa_pd/data/ContactAccessor.h b/src/mesa_pd/data/ContactAccessor.h
index a33d4e804c55b7544ded7b86a01c6352c12d8cef..2bc026efa6fa10e83fbd852be43760a0d9cb3af0 100644
--- a/src/mesa_pd/data/ContactAccessor.h
+++ b/src/mesa_pd/data/ContactAccessor.h
@@ -153,7 +153,7 @@ inline size_t ContactAccessor::find(const id_t& uid)
  *
  * Provides get, set and getRef.
  */
-class SingleContactAccessor : public IAccessor
+class SingleContactAccessor : public IContactAccessor
 {
 public:
    ~SingleContactAccessor() override = default;