renamed some properties