Added fix for final product naming sources and fixed paths in support scripts.