renamed some attributes