Move procs to variable namespace (#2028)