MAINT/BUG: Fix imports & update to underscored fns