renamed some headers