Merge "Fix entites typos"