Use correct base service provider name.
Updates master layout.