Update to new naming conventions
Authored by: benjaminbertram 2015-08-24
Parent: [r302]
Child: [r304]