Added link to next chapter.

Included link to next chapter, consolidated naming functions.