Switch stuff to use a targetPath instead of just a noun