Some more quantum -> neutron renaming.

Change-Id: I68c6df17272d12bbd9c70073ab8653b23b45cf67