Address some naming convention issues