Add array and bool naming.