changed entity names to match tables