Update Manifest default values. Rename class to singular