Bug with _clean fixed

name_clean => clean_name and so on