SCV-16: API-clean up standardize parameter names module-wide