Rename the share point related methods to tomwthinf more generic
Merge fixes