fix entities namespace issue