Refactored the remaining plural model name and Dao's to singular instances.