Move gateway short name methods to Helper class