Revise naming.