Yes, at least the naming doesn't seems optimal. Quite some refactorings ahead of us :)