Check IUPAC rules. I agree mercapto- is outdated, somewhat like the term olefin for alkenes, but I have seen mercapto- used on Aldrich chemicals. I think that when sulfur is the major functional group naming ends in thiol, but when it is a substituent with lesser priority it is referred to as #-mercapto.