Make conventions more consistent