LMW-33 Source formatting and renames