How about s/osname/name?