#115 change constant names to be consistent with option names