diff --git a/YACOSTest/src/org/yacos/tests/core/TestConferenceManager.java b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
similarity index 93%
rename from YACOSTest/src/org/yacos/tests/core/TestConferenceManager.java
rename to YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
index 03c2925..6170f23 100644
--- a/YACOSTest/src/org/yacos/tests/core/TestConferenceManager.java
+++ b/YACOSTest/src/org/yacos/tests/core/ConferenceManagerTest.java
@@ -7,7 +7,7 @@ import org.yacos.core.conferences.ConferenceManagerBean;
 import org.yacos.core.conferences.IConferenceManager;
 
 
-public class TestConferenceManager {
+public class ConferenceManagerTest {
 	IConferenceManager conferenceManager;
 	
 	@BeforeClass
diff --git a/YACOSTest/src/org/yacos/tests/core/TestRole.java b/YACOSTest/src/org/yacos/tests/core/RoleTest.java
similarity index 89%
rename from YACOSTest/src/org/yacos/tests/core/TestRole.java
rename to YACOSTest/src/org/yacos/tests/core/RoleTest.java
index 01c157e..35767a9 100644
--- a/YACOSTest/src/org/yacos/tests/core/TestRole.java
+++ b/YACOSTest/src/org/yacos/tests/core/RoleTest.java
@@ -8,7 +8,7 @@ package org.yacos.tests.core;
  * @author christiancorsano
  *
  */
-public class TestRole {
+public class RoleTest {
 	public void aRoleShouldBeUnique(){
 		// TODO : look for roles of the same type, same user and same conference
 	}
diff --git a/YACOSTest/src/org/yacos/tests/core/TestUser.java b/YACOSTest/src/org/yacos/tests/core/UserTest.java
similarity index 97%
rename from YACOSTest/src/org/yacos/tests/core/TestUser.java
rename to YACOSTest/src/org/yacos/tests/core/UserTest.java
index 61cfd89..9b32d92 100644
--- a/YACOSTest/src/org/yacos/tests/core/TestUser.java
+++ b/YACOSTest/src/org/yacos/tests/core/UserTest.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 import org.yacos.core.users.IUsersManager;
 import org.yacos.core.users.User;
 
-public class TestUser {
+public class UserTest {
 	private IUsersManager manager;
 	
 	@Before