@elainethale Can you remove the t_ from the public interfaces?