Converted variable names to snake case