Changing structure's to use camel-case