minor fixes: renaming and logging
revert to repetitive dependencies declaration