revise naming