Replaces namespace with table. Related to #315