Rename service points for version 2