Use wordSWHID instead of wordSwhid in schema for consistency
rename directorySwhid to directorySWHID and resolveSwhid to resolveSWHID