Ongoing bash work + renaming to simpler names