WIP 131229
Renaming for reversed naming scheme.
WIP 131229