CP soup array and minor fn name changes