Fixed GENERIC_STREAMING / TCP_STREAM naming errors

Change-Id: I97335455ea6529c6231818e463df2d71f654fea0