Complete renaming in scripts (#28)