Fixing convention issues.