Update sidecar names

part of #839