Fixed the short name bug.