Fix confusion between Entities and Characters.