renamed some parts