Remove the `uq` prefix

This PR build on work in #12 and should be merged after #12 is merged to avoid conflicts.