rename/simplify
update copyright