Revert "Rename"

This reverts commit 5e2b73d2b45b46e26fbf64ace13ad3501ff6c811.
Revert "Attempt to use Slick column extension methods against non-standard column types"

This reverts commit dcdbf569d441de8888bf7b03ac186605cc106b3a.