Rename service modules
Rename service modules