Merge "TV: Apply API renamings" into lmp-dev