Merge "neutorn-spi: more remove neutron prefix of field"