Fix to C15-11 so that it can be compiled
Rename items in 17-02 to avoid conflict with 17-01