changes in files for name space and other changes
more changes for name