Function names fixed.