Fix missing antlr dependency
Small naming fixes to schema