the grand renaming... snake-casing function names