2561 - Fixed name changes

https://sourceforge.net/p/oscarmcmaster/bugs/2561/
#3197 Inbox documents dont show next appointment date
http://sourceforge.net/p/oscarmcmaster/bugs/3197/

Change-Id: I851474eeb40272e1dd87745b978eadf6f9378d75
Merge "#3197 Inbox documents dont show next appointment date http://sourceforge.net/p/oscarmcmaster/bugs/3197/" into RELEASE_12_1
Merge "2561 - Fixed name changes" into RELEASE_12_1