Change wrapper_fn/inner_fn to decorator specific function names

Solves #1956. Changes are straightforward, just a couple of renames.