Fixed Naming Convention

Made everything camelCase that I worked with yesterday.  As we continue,
we need to convert anything that was missed.
Another merge

Matthew's branch into Mason's