replaced more camelCase with snake_case