Update and rename const and pointer to const_and_pointer