Update of collisions and change of interface names to make things more intuitive (to me at least).