Merge "Fix odd naming of rcord synchronizer container"