Fix settings routes, rename settings helpers