upgrade the grammar to not use paths