Modified some naming conventions