Found a problem that needs some thinking...
Refactorings and renames, next step on the road.