fixed namespace to be more generic