Changed resource names from plural to singular