solve #1956: use decorator-specific wrapper/inner_fn
Merge pull request #1981 from aronasorman/1956

Change wrapper_fn/inner_fn to decorator specific function names