A few annoying theta issues I had to work out with respect to naming schema