all changed to ns/creator

fixed missed ones