Adhere to rust naming conventions