- Updated naming conventions