Fixed convention mistakes