[TASK] Use renamed Services from Flux