Merge "Fix issues where the filename is referred to as 'sideload'"