Add OS_TYPE to short name as well