Fxied some things regarding merge to 2.10.1 and renamed some packages