Changed to sensible function naming standard