changing nameing conventions