Merge pull request #40 from bernie-simon/rename

Rename
Fix compiler errors.
Merge pull request #41 from mdboom/declarations

Fix compiler errors when -Werror=declaration-after-statement is enabled