Big rename and more pointcut features in UI