move to using the with-namespace macro to make symbol names shorter