Use explicit entity names