fixed naming convention issues