Rename schema to singular