[CF] renamed the entities class, tried fixing the database sharing...