Finish variant naming convention transition