Renamed legacy terms. Updated documentation. This closes #4351. Signed-off-by: Mark Payne <markap14@hotmail.com>