Resolved issues with different guide names for different vers

Change-Id: If487a82bd1d68a13577b3c640117f6c737f48885