Rename remaining <string>s.
Rename remaining <string>s.

dmj/jing-trang,hanshuebner/jing-trang,hanshuebner/jing-trang,brand/jing-trang,dmj/jing-trang,dmj/jing-trang,brand/jing-trang,brand/jing-trang,hanshuebner/jing-trang