Naming harmonization according to review comments.
Authored by: patrikanfalt 2013-01-29
Parent: [r1744]
Child: [r1746]