Fixed array name handling, and srcs
Changing arguments as well as the receiver