some name fixes, first line of osx-base::default