Merge "Consolidate API naming to use Parser everywhere"