changed entity names