Merge branch 'frestr-rename' into 'master'

Rename FRESTR symbols to something more self-explanatory (thanks @eshoag2)

See merge request !12