some naming fixes
progress made in scorer