update naming conventions