Update to better name and namespace