Fix those conventions