clean the naming