Rename and refactor services.

Closes #3535169

Merge request reports

Loading