Improved function naming and error messages.