Maybe rename tag to name? Not topic of this commit though.