Changed folder change processing to change only folder and use existing func_name