Fix and simplify the example code after the rename