fixing some naming conventions