Adding some better naming conventions