Removed v3 from names