More work on search and some name cleanup