Yes, rename dep tracker to Proj name. That should work. You can merge whatever is most useful and maintainable. I'll be offline for a while.