Few changes of names

Some method names renamed to make more sense.