Fix naming and style to make Fynx happy.