fixed naming convention related issues