Fixed bad merge
Fixed lagging error from camelCase to non-camelcase days