diff --git a/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java b/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java
index 8e48c26..d831350 100644
--- a/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java
+++ b/src/main/java/org/sadtech/autoresponder/repository/impl/PersonRepositoryMap.java
@@ -5,7 +5,7 @@ import org.sadtech.autoresponder.repository.PersonRepository;
 
 import java.util.*;
 
-public class PersonRepositoryImpl implements PersonRepository {
+public class PersonRepositoryMap implements PersonRepository {
 
     private Map<Integer, Person> people = new HashMap<>();
 
diff --git a/src/main/java/org/sadtech/autoresponder/repository/impl/UnitRepositoryMap.java b/src/main/java/org/sadtech/autoresponder/repository/impl/UnitRepositoryMap.java
index a9c58e0..7ed7c7e 100644
--- a/src/main/java/org/sadtech/autoresponder/repository/impl/UnitRepositoryMap.java
+++ b/src/main/java/org/sadtech/autoresponder/repository/impl/UnitRepositoryMap.java
@@ -5,7 +5,7 @@ import org.sadtech.autoresponder.repository.UnitRepository;
 
 import java.util.*;
 
-public class UnitRepositoryImpl implements UnitRepository {
+public class UnitRepositoryMap implements UnitRepository {
 
     private Map<Integer, Unit> units = new HashMap<>();
 
diff --git a/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java b/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
index 81ec996..7d79844 100644
--- a/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
+++ b/src/test/java/org/sadtech/autoresponder/AutoresponderTest.java
@@ -2,20 +2,17 @@ package org.sadtech.autoresponder;
 
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.sadtech.autoresponder.entity.Person;
 import org.sadtech.autoresponder.entity.Unit;
-import org.sadtech.autoresponder.repository.impl.PersonRepositoryImpl;
-import org.sadtech.autoresponder.repository.impl.UnitRepositoryImpl;
+import org.sadtech.autoresponder.repository.impl.PersonRepositoryMap;
+import org.sadtech.autoresponder.repository.impl.UnitRepositoryMap;
 import org.sadtech.autoresponder.service.impl.PersonServiceImpl;
 import org.sadtech.autoresponder.service.impl.UnitServiceImpl;
 
 import java.util.ArrayList;
 import java.util.HashSet;
 
-import static org.junit.Assert.*;
-
 public class AutoresponderTest {
 
     private Person person = new Person();
@@ -23,8 +20,8 @@ public class AutoresponderTest {
     private Unit unit2 = new Unit();
     private Unit unit3 = new Unit();
     private ArrayList<Unit> units = new ArrayList<>();
-    private UnitRepositoryImpl unitRepository = new UnitRepositoryImpl();
-    private PersonRepositoryImpl personRepository = new PersonRepositoryImpl();
+    private UnitRepositoryMap unitRepository = new UnitRepositoryMap();
+    private PersonRepositoryMap personRepository = new PersonRepositoryMap();
 
     private UnitServiceImpl unitService = new UnitServiceImpl(unitRepository);
     private PersonServiceImpl personService = new PersonServiceImpl(personRepository);