Organizing and renaming DAO and custom objects for database navctrl