Improve names

Most of the method or test names have been changed to be more descriptive. Some still need work which I have pointed out with comments.