Minor rename.
File renames, indent and minor touches.