Fixed issues

fixed some naming convention issues