Revert "I should probably name functions and pubs correctly (#2)"

This reverts commit f4eec0c0bf2dce4f86eadbb6759cc6a205bc9801.
I should probably name things correctly (#2)