couple search/replaces across all files

couple search/replaces across all files