Made some renamings + minor refactor