Added stub for arrays, updated naming convention