Reverted to more explicit guide ids

Previous method left too much ambiguity and made it difficult to refer
to any guide content