Rename script
Rename bash source file
Rename script
Small script improvements