ProductName updated

Back to long name to avoid some compiling error.