More snake case removal