rename guard trait
minor doc tweaks