Removed plurals from database names and schema check