Fix the remaining uses of the old array name to the new one
Fix for problems introduced in !271 (merged)
Replaces !285 (closed)