a number of renames to align code repository with book
Authored by: vsp_nagel 2015-02-01
Parent: [r31897]
Child: [r31899]