Merge "rename v2 controllers"