Changed some naming conventions.