updated function names to include scope (at function calls)