New naming convention and more pointers