Revert "and some renaming"

This reverts commit 2660009ba9377c8d513d7d7e514d8642a63215c4.
Revert "TO CHECK: consequent naming"

This reverts commit c32e1aefe8b45a2307a1e48f3a4ce6b9d6fda483.
compile errors