Refactor getNameById and add naming to systems in deltas

Don't pull this yet. Just for ease of review.

I'm pretty happy with the refactor commit now. Delta work is not done yet.