clean up the folder name and added names.yaml