Fixed several accidental breaks from switching to snake case