Cleanups for dynamic metrics
Fix 660 qa failure
Update function names and exports file for newly exposed function