DEV: Changed function names again. This should be the last time.