Fix builder class name