removing the corporate namespace since it makes little sense.