Deprecate PRODUCT_DISTPRODUCT/PRODUCT_DISTVERSION. Fix spelling bugs.