src: refractor rename