_s Updates

Updates to code based on changes to _s
Removing Hyphens

This commit corrects a major fail on my part. It replaces hyphens in
function names (which of course is not allowed in PHP...*facepalm*) with
the more appropriate underscores.