Updates naming conventions