Rename severity to priority, fix priority ordering