Inconsistencies in labels for cluster pods

If I check the configuration for the server pod, I get the following:

kind: Pod
metadata:
  labels:
    cluster: mycluster
    role: server

But for the kubelet pod, it shows:

kind: Pod
metadata:
  labels:
    cluster: mycluster
    mode: shared
    type: agent

I was thinking maybe it would be useful to change type: agent to role: agent for consistency, perhaps? Also, maybe adding the mode label to the server, though I do not know if that's useful?

I would be willing to implement this myself if I could get a couple pointers in the right direction.