more partial changes towards namespace locking