Update labels to match spec in #72

More human readable