Moving escaped usings back inside namespace