Updated variables name to snake case