rename and namespace so no goons loads this as is