fixed naming convention consistency

changed camel case to underscores