Improved getting called function and template names.