Use macos
rather than osx
in filenames
#4550
Merged
macos
rather than osx
in filenames
#4550