Everything renamed and in its place