Remove "array" from some more variable names.