bringing over renaming and X-product to these files
trying merge again