Adapt verb daemon to use singular nouns
Add singular and plural nouns to properties
update verbs to use new singular nouns