demarcation: finish the rename