Improve class name generator