fixed thread friendly namespace
fixed plural