fixed COMP_NAME
fixing merge