Refactor class names and add interceptor logging