Fix service aliasing