Some improved function naming.