Fixed some convention issues.