another rename
more code cleaning