Add back cpv-graph param
Controllers/views renaming