Begin updating Guide to use the Show nomenclature
Fixed conflicts