Made the function names a bit more consistent.