Changed order for function replacement classname