Fix doc and names

ok will correct CHM help too