Changing naming conventions and style