Merge "Cleanup: removing "ptr" suffix from var names."