Fix/entity type name not include impls (2)