syntactic and naming fixes