Updated logic with shortnames