Modified template @CLASS_MESSAGE to @CLASS_NAME