Update package to new name and add TODOs for NS changes