Renaming

Renaming  to fit Tab Command Structure. Also a few other updates to
snippets.