fixed some quantum/neutron naming issues