update headers
cut borders
use standard name