more renaming of s1 to basemap