Python: Relabel
C++: Update comments, relabel