renaming and refactor for vsanywher session