fixed short name issues