Fix interface naming and format files