Rename folder names
Remove terminal name config