For references as a basic knowledge, there was no Kumagaya aircraft factory but Kumagaya factory of Nakajima Aircraft as a parts maker.
P1Y was manufactured at Koizumi factory for the navy.
There was another Nakajima's factory called Ohta factory for the army.
Both factories were located side by side.