Reminder object added and minor renaming changes