modified some method's names.