Fixes v2 (renaming)