replacing camel case… partially complete
More progress on eliminating camel case