Revert "Separate symbols for namespace and vars"

This reverts commit 492455c3737fe66993c34df2143d6a8ccce4e74b.