modularize - Fixed broken array use (asserted in tests).  Renamed KindType enum.