Merge "Consistent names for quant-related functions and variables." into experimental