TS-Media] Update (reverse-merged from commit 0a536028111abc0db14f24f4d7fca4924694e503) due to wrong naming convetion