Adding fix for support name