Turn all partialName maps into arrays

Turn all partialName maps into arrays to reduce code complexity