Finish script-primitives renaming started in @7655bd5e