MWEB-794 Naming clean up