copyright update
terminology update