Renaming, reordering and minor tweaks.