Fixed most naming and coding-scheme infractions (issue #11)