Fix issue with scripts renaming
Fix other issues with scripts renaming