Rename service ids