Bringing back class name customization