metomi/rose#884: tidy and rename