some naming fixes, included scheme