Clean acceptance
Change namespace