using ox-build and better names