Renaming and clean up https://github.com/KanoComputing/peldins/issues/703