[FOLD] Rename and refactor. Small updates.