Fixed plural / singular issue in schema naming