updated and unified terms