Ditz issue update
Update Guide modules section for new convention
Update API testcase for new module convention
Merge branch 'guide-c-module-convention'

Update Guide and API testcase for proposed new module convention.