SOS-1606 Renaming, Consolidating and Source Formatting