Bring up to KEY naming standard