Manually merge schemas
Corrected spelling, added name validators