Improved on function calls to incorporate scope naming conventions.