Fixing some naming convention issues
Fixed naming convention issues