Renames functions back to more recognized forms