#44 refactoring tls.hs: remove suffix P from some functions