Update service references to new format