Rename table names from plural to singular