Some renaming, more grammar changes