Forgot to rename some vars, also import the proc namespace.