code cleaned as apparently some refactoring (name changes) were not 100% applied.
;