Attempted to improve naming in duro grammar - and did a bit of cleaning
up there too.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>