Added funcion name to all inner functions