Use version instead of codename as key for f21+