Fixed switch name if it is available