Refactor services name