Replaced manual class name splitting with .demodulize