Update and simplify feed names.