Removing dependence on view name.