[FOLD] Update naming and slight cleanup.