Fix helper class names