few naming changes and small improvements