Those definitions need moving anyway, when that happens I'll add the names too. There are a lot more of those anyway :-S