renamed service tier wiring to be convention consistent