fix paths
fix swap
edit
add chef-client 12 topics
consolidate around shorter names