Fixed some conventions