fix entities name