api names

replaced some AOP terminology with more intuitive names for methods