Reverted name of package to _s, replaced all instances with _s