Allow to use @script instead of @sub and use @func instead of @xw.func

Allow to use @script instead of @sub and use @func instead of @xw.func #2934