[General] Some renaming and formatting